fix imports after rebase

Author: glevco

hathor/transaction/base_transaction.py

@@ -428,7 +428,7 @@ def get_tx_parents(self) -> set[bytes]:
     def get_related_addresses(self) -> set[str]:
         """ Return a set of addresses collected from tx's inputs and outputs.
         """
-        from hathor.transaction.script.scripts import parse_address_script
+        from hathor.transaction.script.construct import parse_address_script
 
         assert self.storage is not None
         addresses: set[str] = set()
@@ -1118,8 +1118,8 @@ def can_melt_token(self) -> bool:
     def to_human_readable(self) -> dict[str, Any]:
         """Checks what kind of script this is and returns it in human readable form
         """
+        from hathor.transaction.script.construct import parse_address_script
         from hathor.transaction.script.nano_contract_match_values import NanoContractMatchValues
-        from hathor.transaction.script.scripts import parse_address_script
 
         script_type = parse_address_script(self.script)
         if script_type:

hathor/verification/transaction_verifier.py

@@ -121,7 +121,7 @@ def verify_without_storage(self, tx: Transaction) -> None:
     def verify_sigops_input(self, tx: Transaction) -> None:
         """ Count sig operations on all inputs and verify that the total sum is below the limit
         """
-        from hathor.transaction.scripts import get_sigops_count
+        from hathor.transaction.script.construct import get_sigops_count
         from hathor.transaction.storage.exceptions import TransactionDoesNotExist
         n_txops = 0
         for tx_input in tx.inputs:
@@ -183,7 +183,7 @@ def verify_script(self, *, tx: Transaction, input_tx: TxInput, spent_tx: BaseTra
         :type input_tx: TxInput
         :type spent_tx: Transaction
         """
-        from hathor.transaction.scripts import script_eval
+        from hathor.transaction.script.execution import script_eval
         try:
             script_eval(tx, input_tx, spent_tx)
         except ScriptError as e:

hathor/verification/vertex_verifier.py

@@ -165,7 +165,7 @@ def verify_number_of_outputs(self, vertex: BaseTransaction) -> None:
     def verify_sigops_output(self, vertex: BaseTransaction) -> None:
         """ Count sig operations on all outputs and verify that the total sum is below the limit
         """
-        from hathor.transaction.scripts import get_sigops_count
+        from hathor.transaction.script.construct import get_sigops_count
         n_txops = 0
 
         for tx_output in vertex.outputs:

tests/tx/test_verification.py

@@ -17,7 +17,7 @@
 from hathor.crypto.util import get_address_from_public_key
 from hathor.manager import HathorManager
 from hathor.transaction import BitcoinAuxPow, Block, MergeMinedBlock, Transaction, TxInput, TxOutput
-from hathor.transaction.scripts import P2PKH
+from hathor.transaction.script.p2pkh import P2PKH
 from hathor.transaction.token_creation_tx import TokenCreationTransaction
 from hathor.transaction.validation_state import ValidationState
 from hathor.verification.block_verifier import BlockVerifier