Check Ratify State (#3175)

* Check Ratify State

---------

Co-authored-by: Martin Kourim <[email protected]>

Author: OlufemiAdeOlusile

cardano_node_tests/tests/test_node_upgrade.py

@@ -185,7 +185,7 @@ def _check_models(cost_models: dict):
         )
 
         rat_action = governance_utils.lookup_ratified_actions(
-            gov_state=rat_gov_state, action_txid=prop_rec.action_txid
+            state=rat_gov_state, action_txid=prop_rec.action_txid
         )
         assert rat_action, "Action not found in ratified actions"
 
@@ -302,7 +302,7 @@ def test_hardfork(
             gov_state=rat_gov_state, name_template=f"{temp_template}_rat_{rat_epoch}"
         )
         rat_action = governance_utils.lookup_ratified_actions(
-            gov_state=rat_gov_state, action_txid=action_txid
+            state=rat_gov_state, action_txid=action_txid
         )
         assert rat_action, "Action not found in ratified actions"
 

cardano_node_tests/tests/tests_conway/test_committee.py

@@ -1100,10 +1100,9 @@ def _check_resign_dbsync(res_member: clusterlib.CCMember) -> None:
             gov_state=rat_add_gov_state, name_template=f"{temp_template}_rat_add_{rat_epoch}"
         )
         rat_action = governance_utils.lookup_ratified_actions(
-            gov_state=rat_add_gov_state, action_txid=action_add_txid
+            state=rat_add_gov_state, action_txid=action_add_txid
         )
         assert rat_action, "Action not found in ratified actions"
-
         # Disapprove ratified add action, the voting shouldn't have any effect
         conway_common.cast_vote(
             cluster_obj=cluster,
@@ -1204,7 +1203,7 @@ def _check_resign_dbsync(res_member: clusterlib.CCMember) -> None:
         # time as the add action is enacted, because ratification of new actions was delayed by
         # the add action.
         rat_action = governance_utils.lookup_ratified_actions(
-            gov_state=enact_add_gov_state, action_txid=action_rem_txid
+            state=enact_add_gov_state, action_txid=action_rem_txid
         )
         assert rat_action, "Action not found in ratified actions"
         reqc.cip038_01.success()
@@ -1468,7 +1467,7 @@ def _check_rat_gov_state(
                 gov_state=gov_state, name_template=f"{name_template}_{epoch_no}"
             )
             rat_action = governance_utils.lookup_ratified_actions(
-                gov_state=gov_state, action_txid=action_txid, action_ix=action_ix
+                state=gov_state, action_txid=action_txid, action_ix=action_ix
             )
             assert rat_action, "Action not found in ratified actions"
             return gov_state
@@ -1724,15 +1723,12 @@ def _check_rat_enact_state(
             # Check ratification
             epoch_rat = cluster.wait_for_epoch(epoch_no=approval_epoch + 1, padding_seconds=5)
 
-            rat_gov_state = cluster.g_query.get_gov_state()
-            conway_common.save_gov_state(
-                gov_state=rat_gov_state, name_template=f"{name_template}_rat_{epoch_rat}"
-            )
-
-            rat_action = governance_utils.lookup_ratified_actions(
-                gov_state=rat_gov_state, action_txid=action_txid
+            rat_state = cluster.g_query.get_ratify_state()
+            rat_action_direct = governance_utils.lookup_ratified_actions(
+                state=rat_state,
+                action_txid=action_txid,
             )
-            assert rat_action, "Action not found in ratified actions"
+            assert rat_action_direct, "Action not found in ratified actions (ratify-state)"
 
             # Wait for enactment
             epoch_enact = cluster.wait_for_epoch(epoch_no=epoch_rat + 1, padding_seconds=5)

cardano_node_tests/tests/tests_conway/test_constitution.py

@@ -484,7 +484,7 @@ def _check_cli_query():
             gov_state=rat_gov_state, name_template=f"{temp_template}_rat_{rat_epoch}"
         )
         rat_action = governance_utils.lookup_ratified_actions(
-            gov_state=rat_gov_state, action_txid=action_txid
+            state=rat_gov_state, action_txid=action_txid
         )
         assert rat_action, "Action not found in ratified actions"
 

cardano_node_tests/tests/tests_conway/test_conway.py

@@ -169,3 +169,18 @@ def test_action_build_unreg_deposit_addr(
             pool_user=pool_user,
             build_method=clusterlib_utils.BuildMethods.BUILD,
         )
+
+    @allure.link(helpers.get_vcs_link())
+    @pytest.mark.smoke
+    def test_ratify_state_fields(self, cluster: clusterlib.ClusterLib):
+        """Check that 'cardano-cli query ratify-state' output has the expected fields."""
+        ratify_state = cluster.g_query.get_ratify_state()
+        expected_fields = {
+            "enactedGovActions",
+            "expiredGovActions",
+            "nextEnactState",
+            "ratificationDelayed",
+        }
+
+        missing = expected_fields - set(ratify_state)
+        assert not missing, f"Missing expected fields in ratify-state: {missing}"

cardano_node_tests/tests/tests_conway/test_drep.py

@@ -1825,7 +1825,7 @@ def _check_ratification(
                 name_template=f"{temp_template}_{action_id}_drep_activity_rat_{rat_epoch}",
             )
             rat_action = governance_utils.lookup_ratified_actions(
-                gov_state=rat_gov_state, action_txid=action_txid
+                state=rat_gov_state, action_txid=action_txid
             )
 
             rat_records[action_id] = DRepRatRecord(id=action_id, ratified=bool(rat_action))

cardano_node_tests/tests/tests_conway/test_guardrails.py

@@ -172,7 +172,7 @@ def _enact_script_constitution():
             cluster.wait_for_epoch(epoch_no=approve_epoch + 1, padding_seconds=5)
             rat_gov_state = cluster.g_query.get_gov_state()
             rat_action = governance_utils.lookup_ratified_actions(
-                gov_state=rat_gov_state, action_txid=action_txid
+                state=rat_gov_state, action_txid=action_txid
             )
             assert rat_action, "Action not found in ratified actions"
 

cardano_node_tests/tests/tests_conway/test_hardfork.py

@@ -206,7 +206,7 @@ def test_hardfork(
             gov_state=rat_gov_state, name_template=f"{temp_template}_rat_{rat_epoch}"
         )
         rat_action = governance_utils.lookup_ratified_actions(
-            gov_state=rat_gov_state, action_txid=action_txid
+            state=rat_gov_state, action_txid=action_txid
         )
         assert rat_action, "Action not found in ratified actions"
         reqc.cip043_01.success()

cardano_node_tests/tests/tests_conway/test_info.py

@@ -248,18 +248,18 @@ def test_info(
         conway_common.save_gov_state(
             gov_state=approved_gov_state, name_template=f"{temp_template}_approved_{approved_epoch}"
         )
-        rat_info_action = governance_utils.lookup_ratified_actions(
-            gov_state=approved_gov_state,
+
+        rat_state = cluster.g_query.get_ratify_state()
+        rat_action = governance_utils.lookup_ratified_actions(
+            state=rat_state,
             action_txid=action_txid,
-            action_ix=action_ix,
         )
-        assert not rat_info_action, "Action found in ratified actions"
+        assert not rat_action, "Action found in ratified actions"
         reqc.cip053.success()
 
+        # Check ratification delay flag
         reqc.cip038_05.start(url=helpers.get_vcs_link())
-        assert not approved_gov_state["nextRatifyState"]["ratificationDelayed"], (
-            "Ratification is delayed unexpectedly"
-        )
+        assert not rat_state["ratificationDelayed"], "Ratification is delayed unexpectedly"
         reqc.cip038_05.success()
 
         # Check deposit is returned

cardano_node_tests/tests/tests_conway/test_no_confidence.py

@@ -230,7 +230,7 @@ def test_no_confidence_action(
                 gov_state=rat_gov_state, name_template=f"{temp_template}_rat_{rat_epoch}"
             )
             rat_action = governance_utils.lookup_ratified_actions(
-                gov_state=rat_gov_state, action_txid=action_txid
+                state=rat_gov_state, action_txid=action_txid
             )
             assert rat_action, "Action not found in ratified actions"
 
@@ -426,7 +426,7 @@ def test_committee_min_size(
 
             # Check that the action is not ratified
             rat_const_action = governance_utils.lookup_ratified_actions(
-                gov_state=approved_gov_state,
+                state=approved_gov_state,
                 action_txid=const_action_txid,
                 action_ix=const_action_ix,
             )

cardano_node_tests/tests/tests_conway/test_pparam_update.py

@@ -1212,7 +1212,7 @@ def _check_state(state: dict):
             )
 
             rat_action = governance_utils.lookup_ratified_actions(
-                gov_state=rat_gov_state, action_txid=fin_prop_rec.action_txid
+                state=rat_gov_state, action_txid=fin_prop_rec.action_txid
             )
             assert rat_action, "Action not found in ratified actions"
             # Disapprove ratified action, the voting shouldn't have any effect