review changes

Author: glevco

hathor/consensus/block_consensus.py

@@ -568,9 +568,9 @@ def update_voided_by_from_parents(self, block: Block) -> bool:
             else:
                 meta.voided_by = voided_by.copy()
             self.context.save(block)
-            block.storage.del_from_critical_indexes(block)
+            block.storage.indexes.del_from_critical_indexes(block)
             with non_critical_code(self.log):
-                block.storage.del_from_non_critical_indexes(block)
+                block.storage.indexes.del_from_non_critical_indexes(block)
             return True
         return False
 

hathor/consensus/transaction_consensus.py

@@ -229,9 +229,9 @@ def update_voided_info(self, tx: Transaction) -> None:
         if voided_by:
             meta.voided_by = voided_by.copy()
             self.context.save(tx)
-            tx.storage.del_from_critical_indexes(tx)
+            tx.storage.indexes.del_from_critical_indexes(tx)
             with non_critical_code(self.log):
-                tx.storage.del_from_non_critical_indexes(tx)
+                tx.storage.indexes.del_from_non_critical_indexes(tx)
 
         # Check conflicts of the transactions voiding us.
         for h in voided_by:
@@ -403,7 +403,7 @@ def remove_voided_by(self, tx: Transaction, voided_hash: bytes) -> bool:
             if not meta2.voided_by:
                 meta2.voided_by = None
                 with non_critical_code(self.log):
-                    tx.storage.add_to_non_critical_indexes(tx2)
+                    tx.storage.indexes.add_to_non_critical_indexes(tx2)
             self.context.save(tx2)
             self.assert_valid_consensus(tx2)
             bfs.add_neighbors()
@@ -507,9 +507,9 @@ def add_voided_by(self, tx: Transaction, voided_hash: bytes, *, is_dag_verificat
                 # All voided transactions with conflicts must have their accumulated weight calculated.
                 tx2.update_accumulated_weight(save_file=False)
             self.context.save(tx2)
-            tx2.storage.del_from_critical_indexes(tx2)
+            tx2.storage.indexes.del_from_critical_indexes(tx2)
             with non_critical_code(self.log):
-                tx2.storage.del_from_non_critical_indexes(tx2)
+                tx2.storage.indexes.del_from_non_critical_indexes(tx2)
             self.assert_valid_consensus(tx2)
             bfs.add_neighbors()
 

hathor/indexes/manager.py

@@ -338,7 +338,7 @@ def non_critical_handle_contract_unexecution(self, tx: BaseTransaction) -> None:
                 case _:
                     assert_never(record)
 
-    def add_tx_to_non_critical_indexes(self, tx: BaseTransaction) -> bool:
+    def add_to_non_critical_indexes(self, tx: BaseTransaction) -> bool:
         """ Add a transaction to the indexes
 
         :param tx: Transaction to be added
@@ -376,14 +376,14 @@ def add_tx_to_non_critical_indexes(self, tx: BaseTransaction) -> bool:
 
         return r2
 
-    def del_tx_from_critical_indexes(self, tx: BaseTransaction) -> None:
+    def del_from_critical_indexes(self, tx: BaseTransaction) -> None:
         assert tx.storage is not None
         # mempool will pick-up if the transaction is voided/invalid and remove it
         if tx.storage.transaction_exists(tx.hash):
             logger.debug('remove from mempool tips', tx=tx.hash_hex)
             self.mempool_tips.update(tx, force_remove=True)
 
-    def del_tx_from_non_critical_indexes(self, tx: BaseTransaction, *, remove_all: bool = False) -> None:
+    def del_from_non_critical_indexes(self, tx: BaseTransaction, *, remove_all: bool = False) -> None:
         """ Delete a transaction from the indexes
 
         :param tx: Transaction to be deleted

hathor/transaction/storage/transaction_storage.py

@@ -345,7 +345,7 @@ def _save_or_verify_genesis(self) -> None:
                 assert tx == tx2
             except TransactionDoesNotExist:
                 self.save_transaction(tx)
-                self.add_to_non_critical_indexes(tx)
+                self.indexes.add_to_non_critical_indexes(tx)
                 tx2 = tx
             self._genesis_cache[tx2.hash] = tx2
 
@@ -482,9 +482,9 @@ def remove_transaction(self, tx: BaseTransaction) -> None:
 
         :param tx: Transaction to be removed
         """
-        self.del_from_critical_indexes(tx)
+        self.indexes.del_from_critical_indexes(tx)
         with non_critical_code(self.log):
-            self.del_from_non_critical_indexes(tx, remove_all=True)
+            self.indexes.del_from_non_critical_indexes(tx, remove_all=True)
 
     @abstractmethod
     def transaction_exists(self, hash_bytes: bytes) -> bool:
@@ -782,18 +782,6 @@ def _topological_sort_metadata(self) -> Iterator[BaseTransaction]:
         """
         raise NotImplementedError
 
-    @abstractmethod
-    def add_to_non_critical_indexes(self, tx: BaseTransaction) -> None:
-        raise NotImplementedError
-
-    @abstractmethod
-    def del_from_critical_indexes(self, tx: BaseTransaction) -> None:
-        raise NotImplementedError
-
-    @abstractmethod
-    def del_from_non_critical_indexes(self, tx: BaseTransaction, *, remove_all: bool = False) -> None:
-        raise NotImplementedError
-
     @abstractmethod
     def get_block_count(self) -> int:
         raise NotImplementedError
@@ -1290,15 +1278,6 @@ def _run_topological_sort_dfs(self, root: BaseTransaction, visited: dict[bytes,
                     else:
                         stack.append(txinput)
 
-    def add_to_non_critical_indexes(self, tx: BaseTransaction) -> None:
-        self.indexes.add_tx_to_non_critical_indexes(tx)
-
-    def del_from_critical_indexes(self, tx: BaseTransaction) -> None:
-        self.indexes.del_tx_from_critical_indexes(tx)
-
-    def del_from_non_critical_indexes(self, tx: BaseTransaction, *, remove_all: bool = False) -> None:
-        self.indexes.del_tx_from_non_critical_indexes(tx, remove_all=remove_all)
-
     def get_block_count(self) -> int:
         return self.indexes.info.get_block_count()
 

hathor/vertex_handler/vertex_handler.py

@@ -238,7 +238,7 @@ def _unsafe_save_and_run_consensus(self, vertex: BaseTransaction) -> None:
         vertex.update_initial_metadata(save=False)
         self._tx_storage.save_transaction(vertex)
         with non_critical_code(self._log):
-            self._tx_storage.add_to_non_critical_indexes(vertex)
+            self._tx_storage.indexes.add_to_non_critical_indexes(vertex)
         self._consensus.unsafe_update(vertex)
 
     def _post_consensus(

hathor_tests/tx/test_tx_storage.py

@@ -154,7 +154,7 @@ def test_vertices_count(self):
 
     def validate_save(self, obj):
         self.tx_storage.save_transaction(obj)
-        self.tx_storage.add_to_non_critical_indexes(obj)
+        self.tx_storage.indexes.add_to_non_critical_indexes(obj)
 
         loaded_obj1 = self.tx_storage.get_transaction(obj.hash)
 
@@ -177,14 +177,14 @@ def validate_save(self, obj):
             self.assertIn(idx_elem, self.tx_storage.indexes.sorted_txs)
             self.assertNotIn(idx_elem, self.tx_storage.indexes.sorted_blocks)
 
-        self.tx_storage.del_from_critical_indexes(obj)
-        self.tx_storage.del_from_non_critical_indexes(obj, remove_all=True)
+        self.tx_storage.indexes.del_from_critical_indexes(obj)
+        self.tx_storage.indexes.del_from_non_critical_indexes(obj, remove_all=True)
 
         self.assertNotIn(idx_elem, self.tx_storage.indexes.sorted_all)
         self.assertNotIn(idx_elem, self.tx_storage.indexes.sorted_txs)
         self.assertNotIn(idx_elem, self.tx_storage.indexes.sorted_blocks)
 
-        self.tx_storage.add_to_non_critical_indexes(obj)
+        self.tx_storage.indexes.add_to_non_critical_indexes(obj)
         self.assertIn(idx_elem, self.tx_storage.indexes.sorted_all)
         if obj.is_block:
             self.assertIn(idx_elem, self.tx_storage.indexes.sorted_blocks)