Skip to content

Commit c47c289

Browse files
committed
refactor(scripts): rename scripts file to construction
1 parent 55e7639 commit c47c289

24 files changed

+37
-37
lines changed

hathor/indexes/utxo_index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from hathor.indexes.base_index import BaseIndex
2323
from hathor.indexes.scope import Scope
2424
from hathor.transaction import BaseTransaction, Block, TxOutput
25-
from hathor.transaction.script.scripts import parse_address_script
25+
from hathor.transaction.script.construct import parse_address_script
2626
from hathor.util import sorted_merger
2727

2828
logger = get_logger()

hathor/merged_mining/coordinator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def parse_login_with_addresses(login: str) -> tuple[bytes, bytes, Optional[str]]
115115
('76a9143d6dbcbf6e67b2cbcc3225994756a56a5e2d3a2788ac', '76a914e52432216dabf32d60a02894ec871293baaa1b1288ac', 'foo')
116116
"""
117117
from hathor.merged_mining.bitcoin import create_output_script as create_output_script_btc
118-
from hathor.transaction.script.scripts import create_output_script as create_output_script_htr
118+
from hathor.transaction.script.construct import create_output_script as create_output_script_htr
119119
parts = login.split('.', maxsplit=2)
120120
if len(parts) < 2:
121121
raise ValueError(

hathor/mining/block_template.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def generate_mining_block(self, rng: Random, merge_mined: bool = False, address:
5757
"""
5858
# XXX: importing these here to try to contain hathor dependencies as much as possible
5959
from hathor.transaction import TransactionMetadata, TxOutput
60-
from hathor.transaction.script.scripts import create_output_script
60+
from hathor.transaction.script.construct import create_output_script
6161

6262
parents = list(self.get_random_parents(rng))
6363
output_script = create_output_script(address) if address is not None else b''

hathor/transaction/resources/create_tx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from hathor.daa import minimum_tx_weight
2121
from hathor.exception import InvalidNewTransaction
2222
from hathor.transaction import Transaction, TxInput, TxOutput
23-
from hathor.transaction.script.scripts import create_output_script
23+
from hathor.transaction.script.construct import create_output_script
2424
from hathor.util import api_catch_exceptions, json_dumpb, json_loadb
2525

2626

hathor/transaction/resources/validate_address.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from hathor.api_util import Resource, set_cors
1919
from hathor.cli.openapi_files.register import register_resource
2020
from hathor.manager import HathorManager
21-
from hathor.transaction.script.scripts import create_base_script
21+
from hathor.transaction.script.construct import create_base_script
2222
from hathor.util import api_catch_exceptions, json_dumpb
2323

2424

hathor/transaction/script/execution.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from hathor.transaction import BaseTransaction, Transaction, TxInput
1616
from hathor.transaction.exceptions import FinalStackInvalid, ScriptError
17-
from hathor.transaction.script.scripts import ScriptExtras, Stack, get_script_op
17+
from hathor.transaction.script.construct import ScriptExtras, Stack, get_script_op
1818

1919

2020
def execute_eval(data: bytes, log: list[str], extras: ScriptExtras) -> None:

hathor/transaction/script/multi_sig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
from hathor.crypto.util import decode_address, get_address_b58_from_redeem_script_hash
1919
from hathor.transaction.script.base_script import BaseScript
20+
from hathor.transaction.script.construct import Stack, get_pushdata, get_script_op, re_compile
2021
from hathor.transaction.script.hathor_script import HathorScript
2122
from hathor.transaction.script.opcode import Opcode, op_pushdata, op_pushdata1
22-
from hathor.transaction.script.scripts import Stack, get_pushdata, get_script_op, re_compile
2323

2424

2525
class MultiSig(BaseScript):

hathor/transaction/script/nano_contract_match_values.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
from typing import Any, Optional
1818

1919
from hathor.crypto.util import get_address_b58_from_bytes
20+
from hathor.transaction.script.construct import binary_to_int, get_pushdata, re_compile
2021
from hathor.transaction.script.hathor_script import HathorScript
2122
from hathor.transaction.script.opcode import Opcode
22-
from hathor.transaction.script.scripts import binary_to_int, get_pushdata, re_compile
2323

2424

2525
# XXX: does it make sense to make this BaseScript too?

hathor/transaction/script/opcode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
TimeLocked,
3939
VerifyFailed,
4040
)
41-
from hathor.transaction.script.scripts import (
41+
from hathor.transaction.script.construct import (
4242
ScriptExtras,
4343
Stack,
4444
binary_to_int,

0 commit comments

Comments
 (0)