refactor: remove static and class methods

Author: glevco

hathor/stratum/stratum.py

@@ -526,8 +526,10 @@ def handle_submit(self, params: dict, msgid: Optional[str]) -> None:
 
         self.log.debug('share received', block=tx, block_base=block_base.hex(), block_base_hash=block_base_hash.hex())
 
+        verifier = VertexVerifier(settings=self._settings)
+
         try:
-            VertexVerifier.verify_pow(tx, override_weight=job.weight)
+            verifier.verify_pow(tx, override_weight=job.weight)
         except PowError:
             self.log.error('bad share, discard', job_weight=job.weight, tx=tx)
             return self.send_error(INVALID_SOLUTION, msgid, {
@@ -543,7 +545,7 @@ def handle_submit(self, params: dict, msgid: Optional[str]) -> None:
         self.manager.reactor.callLater(0, self.job_request)
 
         try:
-            VertexVerifier.verify_pow(tx)
+            verifier.verify_pow(tx)
         except PowError:
             # Transaction pow was not enough, but the share was succesfully submited
             self.log.info('high hash, keep mining', tx=tx)

hathor/verification/block_verifier.py

@@ -54,22 +54,19 @@ def verify_without_storage(self, block: Block) -> None:
         """
         block.verify_without_storage()
 
-    @staticmethod
-    def verify_height(block: Block) -> None:
+    def verify_height(self, block: Block) -> None:
         """Validate that the block height is enough to confirm all transactions being confirmed."""
         block.verify_height()
 
     def verify_weight(self, block: Block) -> None:
         """Validate minimum block difficulty."""
         block.verify_weight()
 
-    @staticmethod
-    def verify_reward(block: Block) -> None:
+    def verify_reward(self, block: Block) -> None:
         """Validate reward amount."""
         block.verify_reward()
 
-    @staticmethod
-    def verify_no_inputs(block: Block) -> None:
+    def verify_no_inputs(self, block: Block) -> None:
         block.verify_no_inputs()
 
     def verify_outputs(self, block: BaseTransaction) -> None:

hathor/verification/merge_mined_block_verifier.py

@@ -19,8 +19,7 @@
 class MergeMinedBlockVerifier(BlockVerifier):
     __slots__ = ()
 
-    @staticmethod
-    def verify_aux_pow(block: MergeMinedBlock) -> None:
+    def verify_aux_pow(self, block: MergeMinedBlock) -> None:
         """ Verify auxiliary proof-of-work (for merged mining).
         """
         block.verify_aux_pow()

hathor/verification/transaction_verifier.py

@@ -61,8 +61,7 @@ def verify_unsigned_skip_pow(self, tx: Transaction) -> None:
         """ Same as .verify but skipping pow and signature verification."""
         tx.verify_unsigned_skip_pow()
 
-    @staticmethod
-    def verify_parents_basic(tx: Transaction) -> None:
+    def verify_parents_basic(self, tx: Transaction) -> None:
         """Verify number and non-duplicity of parents."""
         tx.verify_parents_basic()
 
@@ -84,8 +83,7 @@ def verify_inputs(self, tx: Transaction, *, skip_script: bool = False) -> None:
         """Verify inputs signatures and ownership and all inputs actually exist"""
         tx.verify_inputs(skip_script=skip_script)
 
-    @staticmethod
-    def verify_script(*, tx: Transaction, input_tx: TxInput, spent_tx: BaseTransaction) -> None:
+    def verify_script(self, *, tx: Transaction, input_tx: TxInput, spent_tx: BaseTransaction) -> None:
         """
         :type tx: Transaction
         :type input_tx: TxInput
@@ -104,8 +102,7 @@ def verify_sum(self, tx: Transaction) -> None:
         """
         tx.verify_sum()
 
-    @staticmethod
-    def verify_reward_locked(tx: Transaction) -> None:
+    def verify_reward_locked(self, tx: Transaction) -> None:
         """Will raise `RewardLocked` if any reward is spent before the best block height is enough, considering only
         the block rewards spent by this tx itself, and not the inherited `min_height`."""
         tx.verify_reward_locked()
@@ -121,8 +118,7 @@ def verify_outputs(self, tx: BaseTransaction) -> None:
         """
         tx.verify_outputs()
 
-    @staticmethod
-    def update_token_info_from_outputs(tx: Transaction, *, token_dict: dict[TokenUid, TokenInfo]) -> None:
+    def update_token_info_from_outputs(self, tx: Transaction, *, token_dict: dict[TokenUid, TokenInfo]) -> None:
         """Iterate over the outputs and add values to token info dict. Updates the dict in-place.
 
         Also, checks if no token has authorities on the outputs not present on the inputs

hathor/verification/vertex_verifier.py

@@ -37,8 +37,7 @@ def verify_parents(self, vertex: BaseTransaction) -> None:
         """
         vertex.verify_parents()
 
-    @classmethod
-    def verify_pow(cls, vertex: BaseTransaction, *, override_weight: Optional[float] = None) -> None:
+    def verify_pow(self, vertex: BaseTransaction, *, override_weight: Optional[float] = None) -> None:
         """Verify proof-of-work
 
         :raises PowError: when the hash is equal or greater than the target

tests/simulation/test_simulator.py

@@ -13,7 +13,7 @@ def test_verify_pow(self):
         # just get one of the genesis, we don't really need to create any transaction
         tx = next(iter(manager1.tx_storage.get_all_genesis()))
         # optional argument must be valid, it just has to not raise any exception, there's no assert for that
-        VertexVerifier.verify_pow(tx, override_weight=0.)
+        VertexVerifier(settings=self._settings).verify_pow(tx, override_weight=0.)
 
     def test_one_node(self):
         manager1 = self.create_peer()

tests/tx/test_genesis.py

@@ -33,10 +33,11 @@ def setUp(self):
         self.storage = TransactionMemoryStorage()
 
     def test_pow(self):
+        verifier = VertexVerifier(settings=self._settings)
         genesis = self.storage.get_all_genesis()
         for g in genesis:
             self.assertEqual(g.calculate_hash(), g.hash)
-            self.assertIsNone(VertexVerifier.verify_pow(g))
+            self.assertIsNone(verifier.verify_pow(g))
 
     def test_verify(self):
         genesis = self.storage.get_all_genesis()

tests/wallet/test_wallet_hd.py

@@ -43,7 +43,8 @@ def test_transaction_and_balance(self):
         out = WalletOutputInfo(decode_address(new_address2), self.TOKENS, timelock=None)
         tx1 = self.wallet.prepare_transaction_compute_inputs(Transaction, [out], self.tx_storage)
         tx1.update_hash()
-        TransactionVerifier.verify_script(tx=tx1, input_tx=tx1.inputs[0], spent_tx=block)
+        verifier = TransactionVerifier(settings=self._settings)
+        verifier.verify_script(tx=tx1, input_tx=tx1.inputs[0], spent_tx=block)
         tx1.storage = self.tx_storage
         tx1.get_metadata().validation = ValidationState.FULL
         self.wallet.on_new_tx(tx1)
@@ -63,7 +64,7 @@ def test_transaction_and_balance(self):
         tx2.storage = self.tx_storage
         tx2.update_hash()
         tx2.storage = self.tx_storage
-        TransactionVerifier.verify_script(tx=tx2, input_tx=tx2.inputs[0], spent_tx=tx1)
+        verifier.verify_script(tx=tx2, input_tx=tx2.inputs[0], spent_tx=tx1)
         tx2.get_metadata().validation = ValidationState.FULL
         self.tx_storage.save_transaction(tx2)
         self.wallet.on_new_tx(tx2)