Skip to content

refactor: rename destinations to txouts in tests #3058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkoura merged 1 commit into from
May 26, 2025
Merged

refactor: rename destinations to txouts in tests #3058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cardano_node_tests/tests/test_blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,13 +370,13 @@ def _save_state(curr_epoch: int) -> None:

# Send tx
src_addr, dst_addr = random.sample(payment_addrs, 2)
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])

cluster.g_transaction.send_tx(
src_address=src_addr.address,
tx_name=f"{temp_template}_{int(curr_time)}",
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)

Expand Down Expand Up @@ -557,13 +557,13 @@ def _save_state(curr_epoch: int) -> dict[str, int]:

# Send tx
src_addr, dst_addr = random.sample(payment_addrs, 2)
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])

cluster.g_transaction.send_tx(
src_address=src_addr.address,
tx_name=f"{temp_template}_{int(curr_time)}",
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)

Expand Down
8 changes: 4 additions & 4 deletions cardano_node_tests/tests/test_node_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,15 +376,15 @@ def test_prepare_tx(
src_address = payment_addrs_disposable[0].address
dst_address = payment_addrs_disposable[1].address

destinations = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
txouts = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs_disposable[0].skey_file])

if use_build_cmd:
tx_raw_output = cluster.g_transaction.build_tx(
src_address=src_address,
tx_name=temp_template,
tx_files=tx_files,
txouts=destinations,
txouts=txouts,
fee_buffer=1_000_000,
)
out_file_signed = cluster.g_transaction.sign_tx(
Expand All @@ -396,13 +396,13 @@ def test_prepare_tx(
fee = cluster.g_transaction.calculate_tx_fee(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)
tx_raw_output = cluster.g_transaction.build_raw_tx(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
fee=fee,
)
Expand Down
4 changes: 2 additions & 2 deletions cardano_node_tests/tests/test_reconnect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ def node_submit_tx(
new_socket = pl.Path(orig_socket).parent / f"{node}.socket"

curr_time = time.time()
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])

try:
os.environ["CARDANO_NODE_SOCKET_PATH"] = str(new_socket)
tx_raw_output = cluster_obj.g_transaction.send_tx(
src_address=src_addr.address,
tx_name=f"{temp_template}_{int(curr_time)}",
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
verify_tx=False,
)
Expand Down
4 changes: 2 additions & 2 deletions cardano_node_tests/tests/test_rollback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ def node_submit_tx(
new_socket = pl.Path(orig_socket).parent / f"{node}.socket"

curr_time = time.time()
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])

try:
os.environ["CARDANO_NODE_SOCKET_PATH"] = str(new_socket)
tx_raw_output = cluster_obj.g_transaction.send_tx(
src_address=src_addr.address,
tx_name=f"{temp_template}_{int(curr_time)}",
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)
return tx_raw_output
Expand Down
70 changes: 34 additions & 36 deletions cardano_node_tests/tests/test_tx_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def test_transfer_funds(
src_addr = byron_addrs[0] if src_addr_type == "byron" else payment_addrs[0]
dst_addr = byron_addrs[1] if dst_addr_type == "byron" else payment_addrs[1]

destinations = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])

tx_output = clusterlib_utils.build_and_submit_tx(
Expand All @@ -171,7 +171,7 @@ def test_transfer_funds(
src_address=src_addr.address,
submit_method=submit_method,
use_build_cmd=use_build_cmd,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
# TODO: cardano-node issue #4752
witness_override=2 if src_addr_type == "byron" else None,
Expand Down Expand Up @@ -363,19 +363,19 @@ def test_transfer_all_funds(
dst_address = payment_addrs_disposable[0].address

# Amount value -1 means all available funds
destinations = [clusterlib.TxOut(address=dst_address, amount=-1)]
txouts = [clusterlib.TxOut(address=dst_address, amount=-1)]
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs_disposable[1].skey_file])

fee = cluster.g_transaction.calculate_tx_fee(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)
tx_raw_output = cluster.g_transaction.build_raw_tx(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
fee=fee,
)
Expand Down Expand Up @@ -564,7 +564,7 @@ def test_funds_to_valid_address(
src_address = payment_addrs[0].address
dst_address = "addr_test1vpst87uzwafqkxumyf446zr2jsyn44cfpu9fe8yqanyuh6glj2hkl"

destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])

tx_raw_output = clusterlib_utils.build_and_submit_tx(
Expand All @@ -573,7 +573,7 @@ def test_funds_to_valid_address(
src_address=src_address,
submit_method=submit_method,
use_build_cmd=use_build_cmd,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)

Expand All @@ -589,7 +589,7 @@ def test_funds_to_valid_address(
common.check_missing_utxos(cluster_obj=cluster, utxos=out_utxos)

# Check min UTxO value
min_value = cluster.g_transaction.calculate_min_req_utxo(txouts=destinations)
min_value = cluster.g_transaction.calculate_min_req_utxo(txouts=txouts)
assert min_value.value in tx_common.MIN_UTXO_VALUE

dbsync_utils.check_tx(cluster_obj=cluster, tx_raw_output=tx_raw_output)
Expand Down Expand Up @@ -624,15 +624,15 @@ def test_get_txid(
src_address = payment_addrs[0].address
dst_address = payment_addrs[1].address

destinations = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
txouts = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])
tx_output = clusterlib_utils.build_and_submit_tx(
cluster_obj=cluster,
name_template=temp_template,
src_address=src_address,
submit_method=submit_method,
use_build_cmd=use_build_cmd,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)

Expand Down Expand Up @@ -677,15 +677,15 @@ def test_extra_signing_keys(
tx_files = clusterlib.TxFiles(
signing_key_files=[payment_addrs[0].skey_file, payment_addrs[1].skey_file]
)
destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]

fee = cluster.g_transaction.calculate_tx_fee(
src_address=src_address, tx_name=temp_template, txouts=destinations, tx_files=tx_files
src_address=src_address, tx_name=temp_template, txouts=txouts, tx_files=tx_files
)
tx_raw_output = cluster.g_transaction.build_raw_tx(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
fee=fee,
)
Expand Down Expand Up @@ -741,15 +741,15 @@ def test_duplicate_signing_keys(
tx_files = clusterlib.TxFiles(
signing_key_files=[payment_addrs[0].skey_file, payment_addrs[0].skey_file]
)
destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]

fee = cluster.g_transaction.calculate_tx_fee(
src_address=src_address, tx_name=temp_template, txouts=destinations, tx_files=tx_files
src_address=src_address, tx_name=temp_template, txouts=txouts, tx_files=tx_files
)
tx_raw_output = cluster.g_transaction.build_raw_tx(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
fee=fee,
)
Expand Down Expand Up @@ -806,19 +806,19 @@ def test_sign_wrong_file(
dst_address = payment_addrs[1].address

tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])
destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]

# Build and sign a transaction
fee = cluster.g_transaction.calculate_tx_fee(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)
tx_raw_output = cluster.g_transaction.build_raw_tx(
src_address=src_address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
fee=fee,
)
Expand Down Expand Up @@ -1147,17 +1147,15 @@ def test_utxo_with_datum_hash(
script_data_value="42",
)

destinations_1 = [
clusterlib.TxOut(address=payment_addr_2, amount=amount, datum_hash=datum_hash)
]
txouts_1 = [clusterlib.TxOut(address=payment_addr_2, amount=amount, datum_hash=datum_hash)]
tx_files_1 = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])

tx_raw_output_1 = clusterlib_utils.build_and_submit_tx(
cluster_obj=cluster,
name_template=f"{temp_template}_step_1",
src_address=payment_addr_1,
submit_method=submit_method,
txouts=destinations_1,
txouts=txouts_1,
tx_files=tx_files_1,
)

Expand All @@ -1166,7 +1164,7 @@ def test_utxo_with_datum_hash(
assert datum_hash_utxo[0].datum_hash, "No datum hash"

# Step 2: spend the created utxo
destinations_2 = [clusterlib.TxOut(address=payment_addr_1, amount=-1)]
txouts_2 = [clusterlib.TxOut(address=payment_addr_1, amount=-1)]
tx_files_2 = clusterlib.TxFiles(signing_key_files=[payment_addrs[1].skey_file])

tx_raw_output_2 = clusterlib_utils.build_and_submit_tx(
Expand All @@ -1175,7 +1173,7 @@ def test_utxo_with_datum_hash(
src_address=payment_addr_2,
submit_method=submit_method,
txins=datum_hash_utxo,
txouts=destinations_2,
txouts=txouts_2,
tx_files=tx_files_2,
)

Expand Down Expand Up @@ -1203,21 +1201,21 @@ def test_far_future_ttl(
dst_addr = payment_addrs[1]

tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=2_000_000)]
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=2_000_000)]

ttl = cluster.g_query.get_slot_no() + 10_000_000
fee = cluster.g_transaction.calculate_tx_fee(
src_address=src_addr.address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
invalid_hereafter=ttl,
)

tx_raw_output = cluster.g_transaction.build_raw_tx(
src_address=src_addr.address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
fee=fee,
invalid_hereafter=ttl,
Expand Down Expand Up @@ -1270,7 +1268,7 @@ def test_default_tx_era(
src_address = payment_addrs[0].address
dst_address = payment_addrs[1].address

destinations = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
txouts = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])

tx_output = clusterlib_utils.build_and_submit_tx(
Expand All @@ -1279,7 +1277,7 @@ def test_default_tx_era(
src_address=src_address,
submit_method=submit_method,
use_build_cmd=use_build_cmd,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)

Expand Down Expand Up @@ -1421,7 +1419,7 @@ def test_10_transactions(
dst_init_balance = cluster.g_query.get_address_balance(dst_address)

tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])
destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]

tx_outputs = []
for i in range(no_of_transactions):
Expand All @@ -1430,7 +1428,7 @@ def test_10_transactions(
name_template=f"{temp_template}_{i}",
src_address=src_address,
submit_method=submit_method,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
)
tx_outputs.append(tx_raw_output)
Expand Down Expand Up @@ -1637,7 +1635,7 @@ def test_incremental_signing(

payment_skey_files = [p.skey_file for p in payment_addrs]

destinations = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
tx_files = clusterlib.TxFiles(
signing_key_files=payment_skey_files,
)
Expand All @@ -1647,22 +1645,22 @@ def test_incremental_signing(
src_address=src_addr.address,
tx_name=temp_template,
tx_files=tx_files,
txouts=destinations,
txouts=txouts,
fee_buffer=1_000_000,
witness_override=len(payment_skey_files),
)
else:
fee = cluster.g_transaction.calculate_tx_fee(
src_address=src_addr.address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
witness_count_add=len(payment_skey_files),
)
tx_output = cluster.g_transaction.build_raw_tx(
src_address=src_addr.address,
tx_name=temp_template,
txouts=destinations,
txouts=txouts,
tx_files=tx_files,
fee=fee,
)
Expand Down
Loading
Loading