Skip to content

Commit 574e078

Browse files
mkouramkoura
authored
Merge pull request #3058 from IntersectMBO/mv_destinations_txouts
refactor: rename destinations to txouts in tests
2 parents 24acca7 + 5f8c4f5 commit 574e078

File tree

9 files changed

+78
-80
lines changed

9 files changed

+78
-80
lines changed

‎cardano_node_tests/tests/test_blocks.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,13 +370,13 @@ def _save_state(curr_epoch: int) -> None:
370370

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

376376
cluster.g_transaction.send_tx(
377377
src_address=src_addr.address,
378378
tx_name=f"{temp_template}_{int(curr_time)}",
379-
txouts=destinations,
379+
txouts=txouts,
380380
tx_files=tx_files,
381381
)
382382

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

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

563563
cluster.g_transaction.send_tx(
564564
src_address=src_addr.address,
565565
tx_name=f"{temp_template}_{int(curr_time)}",
566-
txouts=destinations,
566+
txouts=txouts,
567567
tx_files=tx_files,
568568
)
569569

‎cardano_node_tests/tests/test_node_upgrade.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,15 +376,15 @@ def test_prepare_tx(
376376
src_address = payment_addrs_disposable[0].address
377377
dst_address = payment_addrs_disposable[1].address
378378

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

382382
if use_build_cmd:
383383
tx_raw_output = cluster.g_transaction.build_tx(
384384
src_address=src_address,
385385
tx_name=temp_template,
386386
tx_files=tx_files,
387-
txouts=destinations,
387+
txouts=txouts,
388388
fee_buffer=1_000_000,
389389
)
390390
out_file_signed = cluster.g_transaction.sign_tx(
@@ -396,13 +396,13 @@ def test_prepare_tx(
396396
fee = cluster.g_transaction.calculate_tx_fee(
397397
src_address=src_address,
398398
tx_name=temp_template,
399-
txouts=destinations,
399+
txouts=txouts,
400400
tx_files=tx_files,
401401
)
402402
tx_raw_output = cluster.g_transaction.build_raw_tx(
403403
src_address=src_address,
404404
tx_name=temp_template,
405-
txouts=destinations,
405+
txouts=txouts,
406406
tx_files=tx_files,
407407
fee=fee,
408408
)

‎cardano_node_tests/tests/test_reconnect.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ def node_submit_tx(
100100
new_socket = pl.Path(orig_socket).parent / f"{node}.socket"
101101

102102
curr_time = time.time()
103-
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
103+
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
104104
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])
105105

106106
try:
107107
os.environ["CARDANO_NODE_SOCKET_PATH"] = str(new_socket)
108108
tx_raw_output = cluster_obj.g_transaction.send_tx(
109109
src_address=src_addr.address,
110110
tx_name=f"{temp_template}_{int(curr_time)}",
111-
txouts=destinations,
111+
txouts=txouts,
112112
tx_files=tx_files,
113113
verify_tx=False,
114114
)

‎cardano_node_tests/tests/test_rollback.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@ def node_submit_tx(
146146
new_socket = pl.Path(orig_socket).parent / f"{node}.socket"
147147

148148
curr_time = time.time()
149-
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
149+
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=1_000_000)]
150150
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])
151151

152152
try:
153153
os.environ["CARDANO_NODE_SOCKET_PATH"] = str(new_socket)
154154
tx_raw_output = cluster_obj.g_transaction.send_tx(
155155
src_address=src_addr.address,
156156
tx_name=f"{temp_template}_{int(curr_time)}",
157-
txouts=destinations,
157+
txouts=txouts,
158158
tx_files=tx_files,
159159
)
160160
return tx_raw_output

‎cardano_node_tests/tests/test_tx_basic.py‎

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def test_transfer_funds(
162162
src_addr = byron_addrs[0] if src_addr_type == "byron" else payment_addrs[0]
163163
dst_addr = byron_addrs[1] if dst_addr_type == "byron" else payment_addrs[1]
164164

165-
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
165+
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
166166
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])
167167

168168
tx_output = clusterlib_utils.build_and_submit_tx(
@@ -171,7 +171,7 @@ def test_transfer_funds(
171171
src_address=src_addr.address,
172172
submit_method=submit_method,
173173
use_build_cmd=use_build_cmd,
174-
txouts=destinations,
174+
txouts=txouts,
175175
tx_files=tx_files,
176176
# TODO: cardano-node issue #4752
177177
witness_override=2 if src_addr_type == "byron" else None,
@@ -363,19 +363,19 @@ def test_transfer_all_funds(
363363
dst_address = payment_addrs_disposable[0].address
364364

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

369369
fee = cluster.g_transaction.calculate_tx_fee(
370370
src_address=src_address,
371371
tx_name=temp_template,
372-
txouts=destinations,
372+
txouts=txouts,
373373
tx_files=tx_files,
374374
)
375375
tx_raw_output = cluster.g_transaction.build_raw_tx(
376376
src_address=src_address,
377377
tx_name=temp_template,
378-
txouts=destinations,
378+
txouts=txouts,
379379
tx_files=tx_files,
380380
fee=fee,
381381
)
@@ -564,7 +564,7 @@ def test_funds_to_valid_address(
564564
src_address = payment_addrs[0].address
565565
dst_address = "addr_test1vpst87uzwafqkxumyf446zr2jsyn44cfpu9fe8yqanyuh6glj2hkl"
566566

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

570570
tx_raw_output = clusterlib_utils.build_and_submit_tx(
@@ -573,7 +573,7 @@ def test_funds_to_valid_address(
573573
src_address=src_address,
574574
submit_method=submit_method,
575575
use_build_cmd=use_build_cmd,
576-
txouts=destinations,
576+
txouts=txouts,
577577
tx_files=tx_files,
578578
)
579579

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

591591
# Check min UTxO value
592-
min_value = cluster.g_transaction.calculate_min_req_utxo(txouts=destinations)
592+
min_value = cluster.g_transaction.calculate_min_req_utxo(txouts=txouts)
593593
assert min_value.value in tx_common.MIN_UTXO_VALUE
594594

595595
dbsync_utils.check_tx(cluster_obj=cluster, tx_raw_output=tx_raw_output)
@@ -624,15 +624,15 @@ def test_get_txid(
624624
src_address = payment_addrs[0].address
625625
dst_address = payment_addrs[1].address
626626

627-
destinations = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
627+
txouts = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
628628
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])
629629
tx_output = clusterlib_utils.build_and_submit_tx(
630630
cluster_obj=cluster,
631631
name_template=temp_template,
632632
src_address=src_address,
633633
submit_method=submit_method,
634634
use_build_cmd=use_build_cmd,
635-
txouts=destinations,
635+
txouts=txouts,
636636
tx_files=tx_files,
637637
)
638638

@@ -677,15 +677,15 @@ def test_extra_signing_keys(
677677
tx_files = clusterlib.TxFiles(
678678
signing_key_files=[payment_addrs[0].skey_file, payment_addrs[1].skey_file]
679679
)
680-
destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
680+
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]
681681

682682
fee = cluster.g_transaction.calculate_tx_fee(
683-
src_address=src_address, tx_name=temp_template, txouts=destinations, tx_files=tx_files
683+
src_address=src_address, tx_name=temp_template, txouts=txouts, tx_files=tx_files
684684
)
685685
tx_raw_output = cluster.g_transaction.build_raw_tx(
686686
src_address=src_address,
687687
tx_name=temp_template,
688-
txouts=destinations,
688+
txouts=txouts,
689689
tx_files=tx_files,
690690
fee=fee,
691691
)
@@ -741,15 +741,15 @@ def test_duplicate_signing_keys(
741741
tx_files = clusterlib.TxFiles(
742742
signing_key_files=[payment_addrs[0].skey_file, payment_addrs[0].skey_file]
743743
)
744-
destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
744+
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]
745745

746746
fee = cluster.g_transaction.calculate_tx_fee(
747-
src_address=src_address, tx_name=temp_template, txouts=destinations, tx_files=tx_files
747+
src_address=src_address, tx_name=temp_template, txouts=txouts, tx_files=tx_files
748748
)
749749
tx_raw_output = cluster.g_transaction.build_raw_tx(
750750
src_address=src_address,
751751
tx_name=temp_template,
752-
txouts=destinations,
752+
txouts=txouts,
753753
tx_files=tx_files,
754754
fee=fee,
755755
)
@@ -806,19 +806,19 @@ def test_sign_wrong_file(
806806
dst_address = payment_addrs[1].address
807807

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

811811
# Build and sign a transaction
812812
fee = cluster.g_transaction.calculate_tx_fee(
813813
src_address=src_address,
814814
tx_name=temp_template,
815-
txouts=destinations,
815+
txouts=txouts,
816816
tx_files=tx_files,
817817
)
818818
tx_raw_output = cluster.g_transaction.build_raw_tx(
819819
src_address=src_address,
820820
tx_name=temp_template,
821-
txouts=destinations,
821+
txouts=txouts,
822822
tx_files=tx_files,
823823
fee=fee,
824824
)
@@ -1147,17 +1147,15 @@ def test_utxo_with_datum_hash(
11471147
script_data_value="42",
11481148
)
11491149

1150-
destinations_1 = [
1151-
clusterlib.TxOut(address=payment_addr_2, amount=amount, datum_hash=datum_hash)
1152-
]
1150+
txouts_1 = [clusterlib.TxOut(address=payment_addr_2, amount=amount, datum_hash=datum_hash)]
11531151
tx_files_1 = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])
11541152

11551153
tx_raw_output_1 = clusterlib_utils.build_and_submit_tx(
11561154
cluster_obj=cluster,
11571155
name_template=f"{temp_template}_step_1",
11581156
src_address=payment_addr_1,
11591157
submit_method=submit_method,
1160-
txouts=destinations_1,
1158+
txouts=txouts_1,
11611159
tx_files=tx_files_1,
11621160
)
11631161

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

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

11721170
tx_raw_output_2 = clusterlib_utils.build_and_submit_tx(
@@ -1175,7 +1173,7 @@ def test_utxo_with_datum_hash(
11751173
src_address=payment_addr_2,
11761174
submit_method=submit_method,
11771175
txins=datum_hash_utxo,
1178-
txouts=destinations_2,
1176+
txouts=txouts_2,
11791177
tx_files=tx_files_2,
11801178
)
11811179

@@ -1203,21 +1201,21 @@ def test_far_future_ttl(
12031201
dst_addr = payment_addrs[1]
12041202

12051203
tx_files = clusterlib.TxFiles(signing_key_files=[src_addr.skey_file])
1206-
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=2_000_000)]
1204+
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=2_000_000)]
12071205

12081206
ttl = cluster.g_query.get_slot_no() + 10_000_000
12091207
fee = cluster.g_transaction.calculate_tx_fee(
12101208
src_address=src_addr.address,
12111209
tx_name=temp_template,
1212-
txouts=destinations,
1210+
txouts=txouts,
12131211
tx_files=tx_files,
12141212
invalid_hereafter=ttl,
12151213
)
12161214

12171215
tx_raw_output = cluster.g_transaction.build_raw_tx(
12181216
src_address=src_addr.address,
12191217
tx_name=temp_template,
1220-
txouts=destinations,
1218+
txouts=txouts,
12211219
tx_files=tx_files,
12221220
fee=fee,
12231221
invalid_hereafter=ttl,
@@ -1270,7 +1268,7 @@ def test_default_tx_era(
12701268
src_address = payment_addrs[0].address
12711269
dst_address = payment_addrs[1].address
12721270

1273-
destinations = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
1271+
txouts = [clusterlib.TxOut(address=dst_address, amount=2_000_000)]
12741272
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])
12751273

12761274
tx_output = clusterlib_utils.build_and_submit_tx(
@@ -1279,7 +1277,7 @@ def test_default_tx_era(
12791277
src_address=src_address,
12801278
submit_method=submit_method,
12811279
use_build_cmd=use_build_cmd,
1282-
txouts=destinations,
1280+
txouts=txouts,
12831281
tx_files=tx_files,
12841282
)
12851283

@@ -1421,7 +1419,7 @@ def test_10_transactions(
14211419
dst_init_balance = cluster.g_query.get_address_balance(dst_address)
14221420

14231421
tx_files = clusterlib.TxFiles(signing_key_files=[payment_addrs[0].skey_file])
1424-
destinations = [clusterlib.TxOut(address=dst_address, amount=amount)]
1422+
txouts = [clusterlib.TxOut(address=dst_address, amount=amount)]
14251423

14261424
tx_outputs = []
14271425
for i in range(no_of_transactions):
@@ -1430,7 +1428,7 @@ def test_10_transactions(
14301428
name_template=f"{temp_template}_{i}",
14311429
src_address=src_address,
14321430
submit_method=submit_method,
1433-
txouts=destinations,
1431+
txouts=txouts,
14341432
tx_files=tx_files,
14351433
)
14361434
tx_outputs.append(tx_raw_output)
@@ -1637,7 +1635,7 @@ def test_incremental_signing(
16371635

16381636
payment_skey_files = [p.skey_file for p in payment_addrs]
16391637

1640-
destinations = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
1638+
txouts = [clusterlib.TxOut(address=dst_addr.address, amount=amount)]
16411639
tx_files = clusterlib.TxFiles(
16421640
signing_key_files=payment_skey_files,
16431641
)
@@ -1647,22 +1645,22 @@ def test_incremental_signing(
16471645
src_address=src_addr.address,
16481646
tx_name=temp_template,
16491647
tx_files=tx_files,
1650-
txouts=destinations,
1648+
txouts=txouts,
16511649
fee_buffer=1_000_000,
16521650
witness_override=len(payment_skey_files),
16531651
)
16541652
else:
16551653
fee = cluster.g_transaction.calculate_tx_fee(
16561654
src_address=src_addr.address,
16571655
tx_name=temp_template,
1658-
txouts=destinations,
1656+
txouts=txouts,
16591657
tx_files=tx_files,
16601658
witness_count_add=len(payment_skey_files),
16611659
)
16621660
tx_output = cluster.g_transaction.build_raw_tx(
16631661
src_address=src_addr.address,
16641662
tx_name=temp_template,
1665-
txouts=destinations,
1663+
txouts=txouts,
16661664
tx_files=tx_files,
16671665
fee=fee,
16681666
)

0 commit comments

Comments
 (0)