refactor(scripts): mode execute dependencies from construct

Author: glevco

hathor/transaction/scripts/construct.py

@@ -17,18 +17,13 @@
 
 from hathor.conf.get_settings import get_settings
 from hathor.crypto.util import decode_address
-from hathor.transaction.exceptions import OutOfData, ScriptError
+from hathor.transaction.exceptions import ScriptError
 from hathor.transaction.scripts.base_script import BaseScript
 
 if TYPE_CHECKING:
     from hathor.transaction.scripts import P2PKH, MultiSig, Opcode
 
 
-class OpcodePosition(NamedTuple):
-    opcode: int
-    position: int
-
-
 def re_compile(pattern: str) -> Pattern[bytes]:
     """ Transform a given script pattern into a regular expression.
 
@@ -145,51 +140,6 @@ def parse_address_script(script: bytes) -> Optional[Union['P2PKH', 'MultiSig']]:
     return None
 
 
-def get_data_bytes(position: int, length: int, data: bytes) -> bytes:
-    """ Extract `length` bytes from `data` starting at `position`
-
-        :param position: start position of bytes string to extract
-        :type position: int
-
-        :param length: len of bytes str to extract
-        :type length: int
-
-        :param data: script containing data to extract
-        :type data: bytes
-
-        :raises OutOfData: when trying to read out of script
-
-        :return: bytes string of extracted data
-        :rtype: bytes
-    """
-    if not (0 < length <= len(data)):
-        raise OutOfData("length ({}) should be from 0 up to data length".format(length))
-    if not (0 < position < len(data)):
-        raise OutOfData("position should be inside data")
-    if (position+length) > len(data):
-        raise OutOfData('trying to read {} bytes starting at {}, available {}'.format(length, position, len(data)))
-    return data[position:position+length]
-
-
-def get_data_single_byte(position: int, data: bytes) -> int:
-    """ Extract 1 byte from `data` at `position`
-
-        :param position: position of byte to extract
-        :type position: int
-
-        :param data: script containing data to extract
-        :type data: bytes
-
-        :raises OutOfData: when trying to read out of script
-
-        :return: extracted byte
-        :rtype: int
-    """
-    if not (0 <= position < len(data)):
-        raise OutOfData("trying to read a byte at {} outside of data, available {}".format(position, len(data)))
-    return data[position]
-
-
 class _ScriptOperation(NamedTuple):
     opcode: Union['Opcode', int]
     position: int

hathor/transaction/scripts/execute.py

@@ -17,7 +17,6 @@
 
 from hathor.transaction import BaseTransaction, Transaction, TxInput
 from hathor.transaction.exceptions import DataIndexError, FinalStackInvalid, InvalidScriptError, OutOfData, ScriptError
-from hathor.transaction.scripts.construct import OpcodePosition, get_data_bytes, get_data_single_byte
 
 
 class ScriptExtras(NamedTuple):
@@ -35,6 +34,11 @@ class ScriptExtras(NamedTuple):
 Stack = list[Union[bytes, int, str]]
 
 
+class OpcodePosition(NamedTuple):
+    opcode: int
+    position: int
+
+
 def execute_eval(data: bytes, log: list[str], extras: ScriptExtras) -> None:
     """ Execute eval from data executing opcode methods
 
@@ -257,3 +261,48 @@ def binary_to_int(binary: bytes) -> int:
 
     (value,) = struct.unpack(_format, binary)
     return value
+
+
+def get_data_bytes(position: int, length: int, data: bytes) -> bytes:
+    """ Extract `length` bytes from `data` starting at `position`
+
+        :param position: start position of bytes string to extract
+        :type position: int
+
+        :param length: len of bytes str to extract
+        :type length: int
+
+        :param data: script containing data to extract
+        :type data: bytes
+
+        :raises OutOfData: when trying to read out of script
+
+        :return: bytes string of extracted data
+        :rtype: bytes
+    """
+    if not (0 < length <= len(data)):
+        raise OutOfData("length ({}) should be from 0 up to data length".format(length))
+    if not (0 < position < len(data)):
+        raise OutOfData("position should be inside data")
+    if (position+length) > len(data):
+        raise OutOfData('trying to read {} bytes starting at {}, available {}'.format(length, position, len(data)))
+    return data[position:position+length]
+
+
+def get_data_single_byte(position: int, data: bytes) -> int:
+    """ Extract 1 byte from `data` at `position`
+
+        :param position: position of byte to extract
+        :type position: int
+
+        :param data: script containing data to extract
+        :type data: bytes
+
+        :raises OutOfData: when trying to read out of script
+
+        :return: extracted byte
+        :rtype: int
+    """
+    if not (0 <= position < len(data)):
+        raise OutOfData("trying to read a byte at {} outside of data, available {}".format(position, len(data)))
+    return data[position]

tests/tx/test_scripts.py

@@ -26,18 +26,13 @@
     create_base_script,
     create_output_script,
 )
-from hathor.transaction.scripts.construct import (
-    count_sigops,
-    get_data_bytes,
-    get_data_single_byte,
-    get_pushdata,
-    get_sigops_count,
-    re_compile,
-)
+from hathor.transaction.scripts.construct import count_sigops, get_pushdata, get_sigops_count, re_compile
 from hathor.transaction.scripts.execute import (
     binary_to_int,
     decode_opn,
     evaluate_final_stack,
+    get_data_bytes,
+    get_data_single_byte,
     get_data_value,
     get_script_op,
 )