From 595911905fdf46b2fdcad5ce70135d366ab9a5ba Mon Sep 17 00:00:00 2001 From: femi Date: Mon, 15 Sep 2025 02:20:27 +0100 Subject: [PATCH 1/2] This PR refactors test_committee.py align with the new build Method --- .../tests/tests_conway/test_committee.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cardano_node_tests/tests/tests_conway/test_committee.py b/cardano_node_tests/tests/tests_conway/test_committee.py index 32af40f70..300dce37b 100644 --- a/cardano_node_tests/tests/tests_conway/test_committee.py +++ b/cardano_node_tests/tests/tests_conway/test_committee.py @@ -115,14 +115,14 @@ class TestCommittee: @allure.link(helpers.get_vcs_link()) @submit_utils.PARAM_SUBMIT_METHOD - @common.PARAM_USE_BUILD_CMD + @common.PARAM_BUILD_METHOD_NO_EST @pytest.mark.testnets @pytest.mark.smoke def test_register_hot_key_no_cc_member( self, cluster: clusterlib.ClusterLib, pool_user: clusterlib.PoolUser, - use_build_cmd: bool, + build_method: str, submit_method: str, ): """Try to submit a Hot Credential Authorization certificate without being a CC member. @@ -148,7 +148,7 @@ def test_register_hot_key_no_cc_member( name_template=f"{temp_template}_auth", src_address=pool_user.payment.address, submit_method=submit_method, - use_build_cmd=use_build_cmd, + build_method=build_method, tx_files=tx_files_auth, ) err_str = str(excinfo.value) @@ -414,7 +414,7 @@ def _auth_hot_keys() -> None: @allure.link(helpers.get_vcs_link()) @submit_utils.PARAM_SUBMIT_METHOD - @common.PARAM_USE_BUILD_CMD + @common.PARAM_BUILD_METHOD_NO_EST @pytest.mark.parametrize("threshold_type", ("fraction", "decimal")) @pytest.mark.dbsync @pytest.mark.smoke @@ -422,7 +422,7 @@ def test_update_committee_action( self, cluster: clusterlib.ClusterLib, pool_user: clusterlib.PoolUser, - use_build_cmd: bool, + build_method: str, submit_method: str, threshold_type: str, ): @@ -489,7 +489,7 @@ def test_update_committee_action( name_template=f"{temp_template}_bootstrap", src_address=pool_user.payment.address, submit_method=submit_method, - use_build_cmd=use_build_cmd, + build_method=build_method, tx_files=tx_files, deposit=deposit_amt, ) @@ -505,7 +505,7 @@ def test_update_committee_action( name_template=temp_template, src_address=pool_user.payment.address, submit_method=submit_method, - use_build_cmd=use_build_cmd, + build_method=build_method, tx_files=tx_files, deposit=deposit_amt, ) From 79b18117456712ea20716bd279ff438592a12ce9 Mon Sep 17 00:00:00 2001 From: femi Date: Mon, 15 Sep 2025 02:37:04 +0100 Subject: [PATCH 2/2] This PR refactors test_committee.py align with the new build Method --- .../tests/tests_conway/conway_common.py | 2 ++ .../tests/tests_conway/test_committee.py | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cardano_node_tests/tests/tests_conway/conway_common.py b/cardano_node_tests/tests/tests_conway/conway_common.py index 3273a3908..5f6a4bdf6 100644 --- a/cardano_node_tests/tests/tests_conway/conway_common.py +++ b/cardano_node_tests/tests/tests_conway/conway_common.py @@ -118,6 +118,7 @@ def submit_vote( script_votes: clusterlib.OptionalScriptVotes = (), submit_method: str = "", use_build_cmd: bool = True, + build_method: str = clusterlib_utils.BuildMethods.BUILD, witness_count_add: int = 0, ) -> clusterlib.TxRawOutput: """Submit a Tx with votes.""" @@ -135,6 +136,7 @@ def submit_vote( src_address=payment_addr.address, submit_method=submit_method, use_build_cmd=use_build_cmd, + build_method=build_method, tx_files=tx_files, script_votes=script_votes, witness_count_add=witness_count_add, diff --git a/cardano_node_tests/tests/tests_conway/test_committee.py b/cardano_node_tests/tests/tests_conway/test_committee.py index 300dce37b..8b26d17ef 100644 --- a/cardano_node_tests/tests/tests_conway/test_committee.py +++ b/cardano_node_tests/tests/tests_conway/test_committee.py @@ -262,7 +262,7 @@ def _submit_vote(scenario: str, build_method: str, submit_method: str) -> None: votes=vote_cc_all if "_all_" in scenario else [vote_cc_one], keys=vote_keys_all if "_all_" in scenario else [vote_key_one], submit_method=submit_method, - use_build_cmd=build_method == "build", + build_method=clusterlib_utils.BuildMethods.BUILD, ) for smethod in submit_methods: @@ -315,7 +315,7 @@ def _propose_new_member() -> None: cluster_obj=cluster, name_template=temp_template, src_address=pool_user_ug.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files, deposit=deposit_amt, ) @@ -351,7 +351,7 @@ def _auth_hot_keys() -> None: cluster_obj=cluster, name_template=f"{temp_template}_auth", src_address=pool_user_ug.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files_auth, ) @@ -696,7 +696,7 @@ def _auth_hot_keys() -> None: cluster_obj=cluster, name_template=f"{temp_template}_auth", src_address=pool_user_lg.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files_auth, ) @@ -761,7 +761,7 @@ def _add_members() -> tuple[clusterlib.ActionUpdateCommittee, str, int]: cluster_obj=cluster, name_template=f"{temp_template}_action_add", src_address=pool_user_lg.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files_action_add, ) @@ -877,7 +877,7 @@ def _remove_member( cluster_obj=cluster, name_template=f"{temp_template}_action_rem", src_address=pool_user_lg.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files_action_rem, ) @@ -957,7 +957,7 @@ def _get_res_cert(idx: int, cc_auth: governance_utils.CCMemberAuth) -> pl.Path: cluster_obj=cluster, name_template=f"{temp_template}_res_active", src_address=pool_user_lg.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files_res, ) @@ -1422,7 +1422,7 @@ def _rem_committee() -> tuple[clusterlib.ActionUpdateCommittee, str, int]: cluster_obj=cluster, name_template=f"{temp_template}_rem_action", src_address=pool_user_lg.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files_action_rem, ) @@ -1776,7 +1776,7 @@ def _check_rat_enact_state( cluster_obj=cluster, name_template=f"{temp_template}_update_threshold", src_address=pool_user_lg.payment.address, - use_build_cmd=True, + build_method=clusterlib_utils.BuildMethods.BUILD, tx_files=tx_files, )