review changes

Author: glevco

hathor/transaction/scripts/execute.py

@@ -107,20 +107,15 @@ def evaluate_final_stack(stack: Stack, log: list[str]) -> None:
         raise FinalStackInvalid('\n'.join(log))
 
 
-def script_eval(tx: Transaction, spent_tx: BaseTransaction, *, input_index: int) -> 'ScriptContext':
-    """Evaluates the output script and input data according to
-    a very limited subset of Bitcoin's scripting language.
-
-    :param tx: the transaction being validated, the 'owner' of the input data
-    :type tx: :py:class:`hathor.transaction.Transaction`
-
-    :param txin: transaction input being evaluated
-    :type txin: :py:class:`hathor.transaction.TxInput`
-
-    :param spent_tx: the transaction referenced by the input
-    :type spent_tx: :py:class:`hathor.transaction.BaseTransaction`
+def script_eval(*, tx: Transaction, spent_tx: BaseTransaction, input_index: int) -> 'ScriptContext':
+    """
+    Evaluates the output script and input data according to a very limited subset of Bitcoin's scripting language.
+    Raises ScriptError if script verification fails
 
-    :raises ScriptError: if script verification fails
+    Args:
+        tx: the transaction being validated, the 'owner' of the input data
+        spent_tx: the transaction referenced by the input
+        input_index: index of the transaction input being evaluated
     """
     extras = ScriptExtras(tx=tx, input_index=input_index, spent_tx=spent_tx)
     input_data = extras.txin.data

hathor/verification/transaction_verifier.py

@@ -150,12 +150,12 @@ def verify_script(
     ) -> ScriptContext:
         """
         :type tx: Transaction
-        :type input_tx: TxInput
         :type spent_tx: Transaction
+        :type input_index: int
         """
         from hathor.transaction.scripts import script_eval
         try:
-            return script_eval(tx, spent_tx, input_index=input_index)
+            return script_eval(tx=tx, spent_tx=spent_tx, input_index=input_index)
         except ScriptError as e:
             raise InvalidInputData(e) from e
 

tests/tx/test_multisig.py

@@ -134,7 +134,7 @@ def test_spend_multisig(self):
         expected_dict = {'type': 'MultiSig', 'address': self.multisig_address_b58, 'timelock': None}
         self.assertEqual(cls_script.to_human_readable(), expected_dict)
 
-        script_eval(tx, tx1, input_index=0)
+        script_eval(tx=tx, spent_tx=tx1, input_index=0)
 
         # Script error
         with self.assertRaises(ScriptError):

tests/tx/test_nano_contracts.py

@@ -38,4 +38,4 @@ def test_match_values(self):
         txin = TxInput(b'aa', 0, input_data)
         spent_tx = Transaction(hash=b'aa', outputs=[TxOutput(20, script)])
         tx = Transaction(inputs=[txin], outputs=[TxOutput(20, P2PKH.create_output_script(address))])
-        script_eval(tx, spent_tx, input_index=0)
+        script_eval(tx=tx, spent_tx=spent_tx, input_index=0)