Skip to content

Commit 18b89de

Browse files
This PR refactors test_delegation.py
1 parent c29326d commit 18b89de

File tree

1 file changed

+31
-43
lines changed

1 file changed

+31
-43
lines changed

cardano_node_tests/tests/tests_plutus/test_delegation.py

Lines changed: 31 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def register_delegate_stake_addr(
123123
pool_id: str,
124124
redeemer_file: pl.Path,
125125
reference_script_utxos: list[clusterlib.UTXOData] | None,
126-
build_method: str,
126+
use_build_cmd: bool,
127127
) -> tuple[clusterlib.TxRawOutput, list[dict]]:
128128
"""Submit registration certificate and delegate to pool."""
129129
temp_template = f"{temp_template}_reg_deleg"
@@ -186,7 +186,7 @@ def register_delegate_stake_addr(
186186
fee_buffer=2_000_000,
187187
witness_override=len(tx_files.signing_key_files),
188188
)
189-
if build_method == clusterlib_utils.BuildMethods.BUILD
189+
if use_build_cmd
190190
else []
191191
)
192192

@@ -195,7 +195,7 @@ def register_delegate_stake_addr(
195195
name_template=temp_template,
196196
src_address=pool_user.payment.address,
197197
txins=txins,
198-
build_method=build_method,
198+
use_build_cmd=use_build_cmd,
199199
tx_files=tx_files,
200200
complex_certs=[reg_cert_script, deleg_cert_script],
201201
raw_fee=raw_fee,
@@ -224,7 +224,7 @@ def register_stake_addr(
224224
pool_user: delegation.PoolUserScript,
225225
redeemer_file: pl.Path,
226226
reference_script_utxos: list[clusterlib.UTXOData] | None,
227-
build_method: str,
227+
use_build_cmd: bool,
228228
) -> tuple[clusterlib.TxRawOutput, list[dict]]:
229229
"""Register a stake address."""
230230
temp_template = f"{temp_template}_reg"
@@ -250,7 +250,7 @@ def register_stake_addr(
250250
tx_files = clusterlib.TxFiles(signing_key_files=[pool_user.payment.skey_file])
251251
plutus_costs_reg = []
252252

253-
if build_method == clusterlib_utils.BuildMethods.BUILD:
253+
if use_build_cmd:
254254
tx_raw_output_reg = cluster_obj.g_transaction.build_tx(
255255
src_address=pool_user.payment.address,
256256
tx_name=temp_template,
@@ -309,7 +309,7 @@ def delegate_stake_addr(
309309
pool_id: str,
310310
redeemer_file: pl.Path,
311311
reference_script_utxos: list[clusterlib.UTXOData] | None,
312-
build_method: str,
312+
use_build_cmd: bool,
313313
) -> tuple[clusterlib.TxRawOutput, list[dict]]:
314314
"""Delegate a stake address to a pool."""
315315
temp_template = f"{temp_template}_deleg"
@@ -335,7 +335,7 @@ def delegate_stake_addr(
335335
tx_files = clusterlib.TxFiles(signing_key_files=[pool_user.payment.skey_file])
336336
plutus_costs_deleg = []
337337

338-
if build_method == clusterlib_utils.BuildMethods.BUILD:
338+
if use_build_cmd:
339339
tx_raw_output_deleg = cluster_obj.g_transaction.build_tx(
340340
src_address=pool_user.payment.address,
341341
tx_name=temp_template,
@@ -395,7 +395,7 @@ def deregister_stake_addr(
395395
pool_user: delegation.PoolUserScript,
396396
redeemer_file: pl.Path,
397397
reference_script_utxos: list[clusterlib.UTXOData] | None,
398-
build_method: str,
398+
use_build_cmd: bool,
399399
) -> tuple[clusterlib.TxRawOutput, list[dict]]:
400400
"""Deregister stake address."""
401401
temp_template = f"{temp_template}_dereg_withdraw"
@@ -434,7 +434,7 @@ def deregister_stake_addr(
434434

435435
plutus_costs = []
436436

437-
if build_method == clusterlib_utils.BuildMethods.BUILD:
437+
if use_build_cmd:
438438
tx_raw_output = cluster_obj.g_transaction.build_tx(
439439
src_address=pool_user.payment.address,
440440
tx_name=temp_template,
@@ -488,7 +488,7 @@ def deregister_stake_addr(
488488
assert not stake_addr_info.delegation, f"Stake address is still delegated: {stake_addr_info}"
489489

490490
tx_db_dereg = dbsync_utils.check_tx(cluster_obj=cluster_obj, tx_raw_output=tx_raw_output)
491-
if tx_db_dereg and build_method == clusterlib_utils.BuildMethods.BUILD:
491+
if tx_db_dereg and use_build_cmd:
492492
assert pool_user.stake.address in tx_db_dereg.stake_deregistration
493493

494494
# Compare cost of Plutus script with data from db-sync
@@ -504,7 +504,7 @@ def deregister_stake_addr(
504504
# might be already in use.
505505
@common.SKIPIF_BUILD_UNUSABLE
506506
@common.PARAM_PLUTUS_VERSION
507-
@common.PARAM_BUILD_METHOD_NO_EST
507+
@common.PARAM_USE_BUILD_CMD
508508
class TestRegisterAddr:
509509
"""Tests for address registration."""
510510

@@ -515,7 +515,7 @@ def test_register_deregister(
515515
cluster_lock_42stake: tuple[clusterlib.ClusterLib, str],
516516
pool_user: delegation.PoolUserScript,
517517
plutus_version: str,
518-
build_method: str,
518+
use_build_cmd: bool,
519519
):
520520
"""Register and deregister Plutus script stake address.
521521
@@ -615,7 +615,7 @@ def test_register_deregister(
615615
pool_user=pool_user,
616616
redeemer_file=plutus_common.REDEEMER_42,
617617
reference_script_utxos=reference_script_utxos,
618-
build_method=build_method,
618+
use_build_cmd=use_build_cmd,
619619
)
620620

621621
tx_db_record_reg = dbsync_utils.check_tx(
@@ -640,11 +640,7 @@ def test_register_deregister(
640640
pool_user=pool_user,
641641
redeemer_file=plutus_common.REDEEMER_42,
642642
reference_script_utxos=reference_script_utxos,
643-
build_method=(
644-
clusterlib_utils.BuildMethods.BUILD
645-
if VERSIONS.cli != CLI_WITH_ISSUE_942
646-
else clusterlib_utils.BuildMethods.BUILD_RAW
647-
),
643+
use_build_cmd=use_build_cmd and VERSIONS.cli != CLI_WITH_ISSUE_942,
648644
)
649645

650646
if reward_error:
@@ -655,7 +651,7 @@ def test_register_deregister(
655651
tx_view.check_tx_view(cluster_obj=cluster, tx_raw_output=tx_raw_output_dereg)
656652

657653
# Compare cost of Plutus script with data from db-sync
658-
if tx_db_record_reg and clusterlib_utils.BuildMethods.BUILD:
654+
if tx_db_record_reg and use_build_cmd:
659655
dbsync_utils.check_plutus_costs(
660656
redeemer_records=tx_db_record_reg.redeemers, cost_records=plutus_costs_reg
661657
)
@@ -665,7 +661,7 @@ def test_register_deregister(
665661
# might be already in use.
666662
@common.SKIPIF_BUILD_UNUSABLE
667663
@common.PARAM_PLUTUS_VERSION
668-
@common.PARAM_BUILD_METHOD
664+
@common.PARAM_USE_BUILD_CMD
669665
class TestDelegateAddr:
670666
"""Tests for address delegation to stake pools."""
671667

@@ -681,7 +677,7 @@ def test_delegate_deregister( # noqa: C901
681677
cluster_lock_42stake: tuple[clusterlib.ClusterLib, str],
682678
pool_user: delegation.PoolUserScript,
683679
plutus_version: str,
684-
build_method: str,
680+
use_build_cmd: bool,
685681
use_reference_script: bool,
686682
):
687683
"""Register, delegate and deregister Plutus script stake address.
@@ -787,7 +783,7 @@ def test_delegate_deregister( # noqa: C901
787783
pool_id=pool_id,
788784
redeemer_file=plutus_common.REDEEMER_42,
789785
reference_script_utxos=reference_script_utxos,
790-
build_method=build_method,
786+
use_build_cmd=use_build_cmd,
791787
)
792788
except clusterlib.CLIError as exc:
793789
str_exc = str(exc)
@@ -802,14 +798,14 @@ def test_delegate_deregister( # noqa: C901
802798
issues.cli_297.finish_test()
803799

804800
if (
805-
build_method == clusterlib_utils.BuildMethods.BUILD
801+
use_build_cmd
806802
and "overspent budget" in str_exc
807803
and VERSIONS.transaction_era >= VERSIONS.CONWAY
808804
and VERSIONS.cli >= version.parse("10.2.0.0")
809805
):
810806
issues.cli_1023.finish_test()
811807
elif (
812-
build_method == clusterlib_utils.BuildMethods.BUILD
808+
use_build_cmd
813809
and "overspent budget" in str_exc
814810
and VERSIONS.transaction_era >= VERSIONS.CONWAY
815811
):
@@ -833,9 +829,9 @@ def test_delegate_deregister( # noqa: C901
833829
reward_error = ""
834830

835831
# To speed up test run, skip waiting for rewards in selected scenarios
836-
skip_rewards_check = (
837-
use_reference_script and build_method == clusterlib_utils.BuildMethods.BUILD_RAW
838-
) or (not use_reference_script and build_method == clusterlib_utils.BuildMethods.BUILD)
832+
skip_rewards_check = (use_reference_script and not use_build_cmd) or (
833+
not use_reference_script and use_build_cmd
834+
)
839835

840836
if not skip_rewards_check:
841837
LOGGER.info("Waiting 4 epochs for first reward.")
@@ -860,11 +856,7 @@ def test_delegate_deregister( # noqa: C901
860856
pool_user=pool_user,
861857
redeemer_file=plutus_common.REDEEMER_42,
862858
reference_script_utxos=reference_script_utxos,
863-
build_method=(
864-
clusterlib_utils.BuildMethods.BUILD
865-
if VERSIONS.cli != CLI_WITH_ISSUE_942
866-
else clusterlib_utils.BuildMethods.BUILD_RAW
867-
),
859+
use_build_cmd=use_build_cmd and VERSIONS.cli != CLI_WITH_ISSUE_942,
868860
)
869861
except clusterlib.CLIError as exc:
870862
if "(MissingRedeemers" in str(exc):
@@ -903,7 +895,7 @@ def test_register_delegate_deregister(
903895
cluster_lock_42stake: tuple[clusterlib.ClusterLib, str],
904896
pool_user: delegation.PoolUserScript,
905897
plutus_version: str,
906-
build_method: str,
898+
use_build_cmd: bool,
907899
):
908900
"""Register, delegate and deregister Plutus script stake address.
909901
@@ -1015,7 +1007,7 @@ def test_register_delegate_deregister(
10151007
pool_user=pool_user,
10161008
redeemer_file=plutus_common.REDEEMER_42,
10171009
reference_script_utxos=reference_script_utxos,
1018-
build_method=build_method,
1010+
use_build_cmd=use_build_cmd,
10191011
)
10201012

10211013
# Delegate a stake address
@@ -1033,7 +1025,7 @@ def test_register_delegate_deregister(
10331025
pool_id=pool_id,
10341026
redeemer_file=plutus_common.REDEEMER_42,
10351027
reference_script_utxos=reference_script_utxos,
1036-
build_method=build_method,
1028+
use_build_cmd=use_build_cmd,
10371029
)
10381030

10391031
assert cluster.g_query.get_epoch() == init_epoch, (
@@ -1052,7 +1044,7 @@ def test_register_delegate_deregister(
10521044
pool_user=pool_user,
10531045
redeemer_file=plutus_common.REDEEMER_42,
10541046
reference_script_utxos=reference_script_utxos,
1055-
build_method=build_method,
1047+
use_build_cmd=use_build_cmd,
10561048
)
10571049

10581050
tx_db_record_reg = dbsync_utils.check_tx(
@@ -1092,11 +1084,7 @@ def test_register_delegate_deregister(
10921084
pool_user=pool_user,
10931085
redeemer_file=plutus_common.REDEEMER_42,
10941086
reference_script_utxos=reference_script_utxos,
1095-
build_method=(
1096-
clusterlib_utils.BuildMethods.BUILD
1097-
if VERSIONS.cli != CLI_WITH_ISSUE_942
1098-
else clusterlib_utils.BuildMethods.BUILD_RAW
1099-
),
1087+
use_build_cmd=use_build_cmd and VERSIONS.cli != CLI_WITH_ISSUE_942,
11001088
)
11011089

11021090
if reward_error:
@@ -1108,11 +1096,11 @@ def test_register_delegate_deregister(
11081096
tx_view.check_tx_view(cluster_obj=cluster, tx_raw_output=tx_raw_output_dereg)
11091097

11101098
# Compare cost of Plutus script with data from db-sync
1111-
if tx_db_record_reg and build_method == clusterlib_utils.BuildMethods.BUILD:
1099+
if tx_db_record_reg and use_build_cmd:
11121100
dbsync_utils.check_plutus_costs(
11131101
redeemer_records=tx_db_record_reg.redeemers, cost_records=plutus_costs_reg
11141102
)
1115-
if tx_db_record_deleg and build_method == clusterlib_utils.BuildMethods.BUILD:
1103+
if tx_db_record_deleg and use_build_cmd:
11161104
dbsync_utils.check_plutus_costs(
11171105
redeemer_records=tx_db_record_deleg.redeemers, cost_records=plutus_costs_deleg
11181106
)

0 commit comments

Comments
 (0)