aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-18 06:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes based on DBManager unit tests

Browse Source
This commit is contained in:
Sergi Delgado Segura
2019-10-29 14:52:27 -07:00
parent a385fa16a9
commit bc7c7dc26f
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pisa/db_manager.py
View File

@@ -9,6 +9,9 @@ logger = Logger("DBManager")
class DBManager: class DBManager:
def __init__(self, db_path): def __init__(self, db_path):
if not isinstance(db_path, str):
raise ValueError("db_path must be a valid path/name")
try: try:
self.db = plyvel.DB(db_path) self.db = plyvel.DB(db_path)
@@ -22,13 +25,13 @@ class DBManager:
for k, v in self.db.iterator(prefix=prefix.encode('utf-8')): for k, v in self.db.iterator(prefix=prefix.encode('utf-8')):
# Get uuid and appointment_data from the db # Get uuid and appointment_data from the db
uuid = k[1:].decode('utf-8') uuid = k[len(prefix):].decode('utf-8')
data[uuid] = json.loads(v) data[uuid] = json.loads(v)
return data return data
def get_last_known_block(self, prefix): def get_last_known_block(self, key):
last_block = self.db.get(prefix) last_block = self.db.get(key.encode('utf-8'))
if last_block: if last_block:
last_block = last_block.decode('utf-8') last_block = last_block.decode('utf-8')
@@ -74,8 +77,14 @@ class DBManager:
self.delete_entry(uuid, prefix=RESPONDER_PREFIX) self.delete_entry(uuid, prefix=RESPONDER_PREFIX)
logger.info("Deleting appointment from Responder's db", uuid=uuid) logger.info("Deleting appointment from Responder's db", uuid=uuid)
def store_last_block_watcher(self, block_hash): def load_last_block_hash_watcher(self):
return self.get_last_known_block(WATCHER_LAST_BLOCK_KEY)
def load_last_block_hash_responder(self):
return self.get_last_known_block(RESPONDER_LAST_BLOCK_KEY)
def store_last_block_hash_watcher(self, block_hash):
self.create_entry(WATCHER_LAST_BLOCK_KEY, block_hash) self.create_entry(WATCHER_LAST_BLOCK_KEY, block_hash)
def store_last_block_responder(self, block_hash): def store_last_block_hash_responder(self, block_hash):
self.create_entry(RESPONDER_LAST_BLOCK_KEY, block_hash) self.create_entry(RESPONDER_LAST_BLOCK_KEY, block_hash)

2
pisa/responder.py
View File

@@ -165,7 +165,7 @@ class Responder:
self.handle_reorgs() self.handle_reorgs()
# Register the last processed block for the responder # Register the last processed block for the responder
self.db_manager.store_last_block_responder(block_hash) self.db_manager.store_last_block_hash_responder(block_hash)
prev_block_hash = block.get('hash') prev_block_hash = block.get('hash')

2
pisa/watcher.py
View File

@@ -141,7 +141,7 @@ class Watcher:
self.db_manager.store_watcher_appointment(uuid, appointment.to_json()) self.db_manager.store_watcher_appointment(uuid, appointment.to_json())
# Register the last processed block for the watcher # Register the last processed block for the watcher
self.db_manager.store_last_block_watcher(block_hash) self.db_manager.store_last_block_hash_watcher(block_hash)
# Go back to sleep if there are no more appointments # Go back to sleep if there are no more appointments
self.asleep = True self.asleep = True