handle none

Chia-Network · Dec 9, 2024 · b229e7e · b229e7e
1 parent 74b27f4
commit b229e7e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/chia/_tests/util/blockchain_mock.py b/chia/_tests/util/blockchain_mock.py
@@ -77,7 +77,8 @@ def contains_block(self, header_hash: bytes32, height: Optional[uint32] = None)
                 return False
             height = block_rec.height
         block_hash_from_hh = self.height_to_hash(height)
-        assert block_hash_from_hh is not None
+        if block_hash_from_hh is None:
+            return False
         assert block_hash_from_hh == header_hash
         return True
 

diff --git a/chia/consensus/blockchain.py b/chia/consensus/blockchain.py
@@ -780,7 +780,8 @@ def contains_block(self, header_hash: bytes32, height: Optional[uint32] = None)
                 return False
             height = block_rec.height
         block_hash_from_hh = self.height_to_hash(height)
-        assert block_hash_from_hh is not None
+        if block_hash_from_hh is None:
+            return False
         assert block_hash_from_hh == header_hash
         return True
 

diff --git a/chia/util/augmented_chain.py b/chia/util/augmented_chain.py
@@ -123,8 +123,11 @@ def contains_block(self, header_hash: bytes32, height: Optional[uint32] = None)
             if block_rec is None:
                 return False
             height = block_rec.height
+        if not self.contains_height(height):
+            return False
         block_hash_from_hh = self.height_to_hash(height)
-        assert block_hash_from_hh is not None
+        if block_hash_from_hh is None:
+            return False
         assert block_hash_from_hh == header_hash
         return True
 

diff --git a/chia/util/block_cache.py b/chia/util/block_cache.py
@@ -54,7 +54,8 @@ def contains_block(self, header_hash: bytes32, height: Optional[uint32] = None)
                 return False
             height = block_rec.height
         block_hash_from_hh = self.height_to_hash(height)
-        assert block_hash_from_hh is not None
+        if block_hash_from_hh is None:
+            return False
         assert block_hash_from_hh == header_hash
         return True
 

diff --git a/chia/wallet/wallet_blockchain.py b/chia/wallet/wallet_blockchain.py
@@ -203,7 +203,8 @@ def contains_block(self, header_hash: bytes32, height: Optional[uint32] = None)
                 return False
             height = block_rec.height
         block_hash_from_hh = self.height_to_hash(height)
-        assert block_hash_from_hh is not None
+        if block_hash_from_hh is None:
+            return False
         assert block_hash_from_hh == header_hash
         return True