Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions cardano_node_tests/tests/tests_conway/conway_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand All @@ -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,
Expand Down
32 changes: 16 additions & 16 deletions cardano_node_tests/tests/tests_conway/test_committee.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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,
)
Expand Down Expand Up @@ -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,
)

Expand Down Expand Up @@ -414,15 +414,15 @@ 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
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,
):
Expand Down Expand Up @@ -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,
)
Expand All @@ -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,
)
Expand Down Expand Up @@ -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,
)

Expand Down Expand Up @@ -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,
)

Expand Down Expand Up @@ -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,
)

Expand Down Expand Up @@ -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,
)

Expand Down Expand Up @@ -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,
)

Expand Down Expand Up @@ -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,
)

Expand Down
Loading