From 75234310ca4fe97c43e6528f1ef21bb183e85b36 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Sun, 24 Jan 2021 23:29:02 +0000 Subject: [PATCH] added blockio load implementation --- src/blockio/__init__.py | 1 + src/blockio/load/__init__.py | 15 +++++++++------ tests/test_blockio.py | 13 +++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/blockio/__init__.py b/src/blockio/__init__.py index f88116e2..85dd0e64 100644 --- a/src/blockio/__init__.py +++ b/src/blockio/__init__.py @@ -3,6 +3,7 @@ Wrap safedb for storing and fetching blocks """ from .store import store_block +from .load import load_block, list_blocks_by_type """ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/blockio/load/__init__.py b/src/blockio/load/__init__.py index d4ac588d..684e4ae0 100644 --- a/src/blockio/load/__init__.py +++ b/src/blockio/load/__init__.py @@ -2,11 +2,12 @@ Get blocks from safedb """ -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, List from kasten import Kasten if TYPE_CHECKING: + from kasten.types import BlockChecksumBytes from safedb import SafeDB """ This program is free software: you can redistribute it and/or modify @@ -23,11 +24,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . """ + def load_block(block: 'BlockChecksumBytes', safe_db: 'SafeDB') -> Kasten: - kasten_generator = get_generator - return Kasten() - - -#def list_blocks_by_type(block_type: str, safe_db: 'SafeDB'): + return Kasten( + block, safe_db.get(block), generator=None, auto_check_generator=False) +def list_blocks_by_type( + block_type: str, safe_db: 'SafeDB') -> List['BlockChecksumBytes']: + blocks = safe_db.get(f'bl-{block_type}') + return zip(*[iter(blocks)]*64) diff --git a/tests/test_blockio.py b/tests/test_blockio.py index 8a61a0ee..b67acf65 100644 --- a/tests/test_blockio.py +++ b/tests/test_blockio.py @@ -16,6 +16,7 @@ setup_default_plugins() import kasten from onionrblocks.generators import anonvdf +from onionrblocks import blockcreator from utils import identifyhome import safedb @@ -47,6 +48,18 @@ class TestBlockIO(unittest.TestCase): db.close() _remove_db(db_file) + def test_list_blocks(self): + db_file = identifyhome.identify_home() + 'test.db' + db = safedb.SafeDB(db_file) + expected_list = [] + for i in range(10): + bl = blockcreator.create_anonvdf_block(b'test' + int(i).to_bytes(1, 'big'), 'txt', 60) + blockio.store_block(bl, db) + expected_list.append(bl.id) + l = blockio.list_blocks_by_type('txt', db) + self.assertEqual(len(list(l)), len(expected_list)) + for i in l: + self.assertIn(bytes(i), expected_list) unittest.main()