add logging, refactor ensure previous block

pdxwebdev · Jan 21, 2021 · 158aac8 · 158aac8
1 parent 30c0b4b
commit 158aac8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/yadacoin/core/blockchain.py b/yadacoin/core/blockchain.py
@@ -162,23 +162,19 @@ async def get_inputs(inputs):
                     continue
 
         if block.index >= 35200 and delta_t < 600 and block.special_min:
-            self.config.app_log.warning('1')
+            self.config.app_log.warning(f'Failed: {block.index} >= {35200} and {delta_t} < {600} and {block.special_min}')
             return False
 
         if int(block.index) > CHAIN.CHECK_TIME_FROM and int(block.time) < int(last_block.time):
-            self.config.app_log.warning('2')
+            self.config.app_log.warning(f'Failed: {int(block.index)} > {CHAIN.CHECK_TIME_FROM} and {int(block.time)} < {int(last_block.time)}')
             return False
 
         if last_block.index != (block.index - 1) or last_block.hash != block.prev_hash:
-            self.config.app_log.warning('3')
+            self.config.app_log.warning(f'Failed: {last_block.index}, {(block.index - 1)} or {last_block.hash} != {block.prev_hash}')
             return False
 
         if int(block.index) > CHAIN.CHECK_TIME_FROM and (int(block.time) < (int(last_block.time) + 600)) and block.special_min:
-            self.config.app_log.warning('4')
-            return False
-
-        if block.index >= 35200 and delta_t < 600 and block.special_min:
-            self.config.app_log.warning('5')
+            self.config.app_log.warning(f'Failed: {int(block.index)} > {CHAIN.CHECK_TIME_FROM} and ({int(block.time)} < ({int(last_block.time)} + {600})) and {block.special_min}')
             return False
 
         target_block_time = CHAIN.target_block_time(self.config.network)

diff --git a/yadacoin/tcpsocket/node.py b/yadacoin/tcpsocket/node.py
@@ -152,13 +152,9 @@ async def newblock(self, body, stream):
             )
 
     async def ensure_previous_block(self, block, stream):
-        have_prev = await self.config.mongo.async_db.blocks.find_one({
-            'hash': block.prev_hash
-        })
+        have_prev = await self.ensure_previous_on_blockchain(block)
         if not have_prev:
-            have_prev = await self.config.mongo.async_db.consensus.find_one({
-                'block.hash': block.prev_hash
-            })
+            have_prev = await self.ensure_previous_in_consensus(block)
             if not have_prev:
                 await self.write_params(
                     stream,
@@ -176,6 +172,11 @@ async def ensure_previous_on_blockchain(self, block):
             'hash': block.prev_hash
         })
 
+    async def ensure_previous_in_consensus(self, block):
+        return await self.config.mongo.async_db.consensus.find_one({
+            'block.hash': block.prev_hash
+        })
+
     async def send_block(self, block):
         async for peer_stream in self.config.peer.get_sync_peers():
             await self.write_params(