Skip to content

Refactor queries #3062

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 3 commits into from
May 27, 2025
Merged

Refactor queries #3062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbf490a
refactor(governance): use g_query for governance queries
mkoura May 27, 2025
537cde9
refactor(query): use explicit get_* query methods
mkoura May 27, 2025
404b20e
chore(deps): bump cardano-clusterlib to 0.9.0
mkoura May 27, 2025
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
14 changes: 7 additions & 7 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 @@ -137,7 +137,7 @@ def test_update_cost_models(

prev_action_rec = governance_utils.get_prev_action(
action_type=governance_utils.PrevGovActionIds.PPARAM_UPDATE,
gov_state=cluster.g_governance.query.gov_state(),
gov_state=cluster.g_query.get_gov_state(),
)

def _propose_pparams_update(
Expand Down Expand Up @@ -179,7 +179,7 @@ def _check_models(cost_models: dict):

# Check ratification
rat_epoch = cluster.wait_for_epoch(epoch_no=vote_epoch + 1, padding_seconds=5)
rat_gov_state = cluster.g_governance.query.gov_state()
rat_gov_state = cluster.g_query.get_gov_state()
conway_common.save_gov_state(
gov_state=rat_gov_state, name_template=f"{temp_template}_rat_{rat_epoch}"
)
Expand All @@ -197,7 +197,7 @@ def _check_models(cost_models: dict):
enact_epoch = cluster.wait_for_epoch(
epoch_no=vote_epoch + 2, padding_seconds=5, future_is_ok=False
)
enact_gov_state = cluster.g_governance.query.gov_state()
enact_gov_state = cluster.g_query.get_gov_state()
conway_common.save_gov_state(
gov_state=enact_gov_state, name_template=f"{temp_template}_enact_{enact_epoch}"
)
Expand Down Expand Up @@ -226,7 +226,7 @@ def test_hardfork(
anchor_data = governance_utils.get_default_anchor_data()
prev_action_rec = governance_utils.get_prev_action(
action_type=governance_utils.PrevGovActionIds.HARDFORK,
gov_state=cluster.g_governance.query.gov_state(),
gov_state=cluster.g_query.get_gov_state(),
)

hardfork_action = cluster.g_governance.action.create_hardfork(
Expand Down Expand Up @@ -263,7 +263,7 @@ def test_hardfork(
)

action_txid = cluster.g_transaction.get_txid(tx_body_file=tx_output_action.out_file)
action_gov_state = cluster.g_governance.query.gov_state()
action_gov_state = cluster.g_query.get_gov_state()
action_epoch = cluster.g_query.get_epoch()
conway_common.save_gov_state(
gov_state=action_gov_state, name_template=f"{temp_template}_action_{action_epoch}"
Expand Down Expand Up @@ -297,7 +297,7 @@ def test_hardfork(

# Check ratification
rat_epoch = cluster.wait_for_epoch(epoch_no=init_epoch + 1, padding_seconds=5)
rat_gov_state = cluster.g_governance.query.gov_state()
rat_gov_state = cluster.g_query.get_gov_state()
conway_common.save_gov_state(
gov_state=rat_gov_state, name_template=f"{temp_template}_rat_{rat_epoch}"
)
Expand All @@ -312,7 +312,7 @@ def test_hardfork(

# Check enactment
enact_epoch = cluster.wait_for_epoch(epoch_no=init_epoch + 2, padding_seconds=5)
enact_gov_state = cluster.g_governance.query.gov_state()
enact_gov_state = cluster.g_query.get_gov_state()
conway_common.save_gov_state(
gov_state=enact_gov_state, name_template=f"{temp_template}_enact_{enact_epoch}"
)
Expand Down
12 changes: 6 additions & 6 deletions cardano_node_tests/tests/tests_conway/conway_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ def cast_vote(
)

# Make sure the vote is included in the ledger
gov_state = cluster_obj.g_governance.query.gov_state()
gov_state = cluster_obj.g_query.get_gov_state()
vote_epoch = cluster_obj.g_query.get_epoch()
save_gov_state(
gov_state=gov_state,
Expand Down Expand Up @@ -337,7 +337,7 @@ def resign_ccs(
)

cluster_obj.wait_for_new_block(new_blocks=2)
res_committee_state = cluster_obj.g_governance.query.committee_state()
res_committee_state = cluster_obj.g_query.get_committee_state()
save_committee_state(committee_state=res_committee_state, name_template=f"{name_template}_res")
for cc_member in ccs_to_resign:
member_key = f"keyHash-{cc_member.cold_vkey_hash}"
Expand All @@ -364,7 +364,7 @@ def propose_change_constitution(

prev_action_rec = governance_utils.get_prev_action(
action_type=governance_utils.PrevGovActionIds.CONSTITUTION,
gov_state=cluster_obj.g_governance.query.gov_state(),
gov_state=cluster_obj.g_query.get_gov_state(),
)

constitution_action = cluster_obj.g_governance.action.create_constitution(
Expand Down Expand Up @@ -406,7 +406,7 @@ def propose_change_constitution(
), f"Incorrect balance for source address `{pool_user.payment.address}`"

action_txid = cluster_obj.g_transaction.get_txid(tx_body_file=tx_output.out_file)
action_gov_state = cluster_obj.g_governance.query.gov_state()
action_gov_state = cluster_obj.g_query.get_gov_state()
action_epoch = cluster_obj.g_query.get_epoch()
save_gov_state(
gov_state=action_gov_state,
Expand Down Expand Up @@ -440,7 +440,7 @@ def propose_pparams_update(

prev_action_rec = prev_action_rec or governance_utils.get_prev_action(
action_type=governance_utils.PrevGovActionIds.PPARAM_UPDATE,
gov_state=cluster_obj.g_governance.query.gov_state(),
gov_state=cluster_obj.g_query.get_gov_state(),
)

update_args = clusterlib_utils.get_pparams_update_args(update_proposals=proposals)
Expand Down Expand Up @@ -482,7 +482,7 @@ def propose_pparams_update(
), f"Incorrect balance for source address `{pool_user.payment.address}`"

action_txid = cluster_obj.g_transaction.get_txid(tx_body_file=tx_output_action.out_file)
action_gov_state = cluster_obj.g_governance.query.gov_state()
action_gov_state = cluster_obj.g_query.get_gov_state()
action_epoch = cluster_obj.g_query.get_epoch()
save_gov_state(
gov_state=action_gov_state, name_template=f"{name_template}_action_{action_epoch}"
Expand Down
Loading
Loading