fixed unsynced flow cache

onionr/communicatorutils/downloadblocks/__init__.py

@@ -102,7 +102,7 @@ def download_blocks_from_communicator(comm_inst):
                         blacklist.addToDB(blockHash)
             else:
                 # if block didn't meet expected hash
-                tempHash = crypto.sha3Hash(content) # lazy hack, TODO use var
+                tempHash = onionrcrypto.hashers.sha3_hash(content) # lazy hack, TODO use var
                 try:
                     tempHash = tempHash.decode()
                 except AttributeError:

onionr/communicatorutils/housekeeping.py

@@ -25,6 +25,13 @@ from coredb import blockmetadb, dbfiles
 import onionrstorage
 from onionrstorage import removeblock
 import onionrblacklist
+
+def __remove_from_upload(comm_inst, block_hash: str):
+    try:
+        comm_inst.blocksToUpload.remove(block_hash)
+    except ValueError:
+        pass
+
 def clean_old_blocks(comm_inst):
     '''Delete old blocks if our disk allocation is full/near full, and also expired blocks'''
     blacklist = onionrblacklist.OnionrBlackList()
@@ -33,13 +40,15 @@ def clean_old_blocks(comm_inst):
         blacklist.addToDB(bHash)
         removeblock.remove_block(bHash)
         onionrstorage.deleteBlock(bHash)
+        __remove_from_upload(comm_inst, bHash)
         logger.info('Deleted block: %s' % (bHash,))
 
     while comm_inst.storage_counter.isFull():
         oldest = blockmetadb.get_block_list()[0]
         blacklist.addToDB(oldest)
         removeblock.remove_block(oldest)
-        onionrstorage.deleteBlock(bHash)
+        onionrstorage.deleteBlock(oldest)
+        __remove_from_upload.remove(comm_inst, oldest)
         logger.info('Deleted block: %s' % (oldest,))
 
     comm_inst.decrementThreadCount('clean_old_blocks')