cleaner way

Author: OlufemiAdeOlusile

cardano_node_tests/tests/issues.py

@@ -191,6 +191,12 @@
     fixed_in="10.1.3.0",  # Unknown yet, will be fixed/changed sometime in the future
     message="Delegation to DRep2 removed after retirement of DRep1.",
 )
+ledger_5365 = blockers.GH(
+    issue=5365,
+    repo="IntersectMBO/cardano-ledger",
+    fixed_in="10.6.0.0",
+    message="queryPoolState returns current pool params instead of the future ones.",
+)
 
 node_3788 = blockers.GH(
     issue=3788,

cardano_node_tests/tests/test_chain_transactions.py

@@ -75,9 +75,14 @@ def _repeat_submit(cluster_obj: clusterlib.ClusterLib, tx_file: pl.Path) -> str:
             cluster_obj.g_transaction.submit_tx_bare(tx_file=tx_file)
         except clusterlib.CLIError as exc:
             exc_str = str(exc)
-            if r == 0 and "(BadInputsUTxO" in exc_str:
+            inputs_spent = (
+                '(ConwayMempoolFailure "All inputs are spent.'
+                in exc_str  # In cardano-node >= 10.6.0
+                or "(BadInputsUTxO" in exc_str
+            )
+            if r == 0 and inputs_spent:
                 err_str = "Tx input is missing, maybe temporary fork happened?"
-            elif "(BadInputsUTxO" in exc_str:
+            elif inputs_spent:
                 break
             raise
         if r > 2:

cardano_node_tests/tests/test_pool_saturation.py

@@ -52,11 +52,9 @@ def _get_saturation_threshold(
     cluster_obj: clusterlib.ClusterLib, ledger_state: dict, pool_id: str
 ) -> int:
     """Calculate how much Lovelace is needed to reach saturation threshold."""
-    account_state = ledger_state["stateBefore"]["esAccountState"]
+    account_state = clusterlib_utils.get_chain_account_state(ledger_state=ledger_state)
     active_supply = (
-        cluster_obj.genesis["maxLovelaceSupply"]
-        - account_state["reserves"]
-        - account_state["treasury"]
+        cluster_obj.genesis["maxLovelaceSupply"] - account_state.reserves - account_state.treasury
     )
     k_param = cluster_obj.g_query.get_protocol_params()["stakePoolTargetNum"]
     saturation_amount = int(active_supply / k_param)

cardano_node_tests/tests/test_pools.py

@@ -23,6 +23,7 @@
 
 from cardano_node_tests.cluster_management import cluster_management
 from cardano_node_tests.tests import common
+from cardano_node_tests.tests import issues
 from cardano_node_tests.utils import cluster_nodes
 from cardano_node_tests.utils import clusterlib_utils
 from cardano_node_tests.utils import configuration
@@ -117,7 +118,8 @@ def _check_staking(
 
         assert (
             # Strip 'e0' from the beginning of the address hash
-            helpers.decode_bech32(stake_addr_info.address)[2:] in pool_params["owners"]
+            helpers.decode_bech32(stake_addr_info.address)[2:]
+            in helpers.get_pool_param("owners", pool_params=pool_params)
         ), "'owner' value is different than expected"
 
 
@@ -1465,12 +1467,12 @@ def test_update_stake_pool_metadata(
             raise ValueError(msg)
 
         # Check that pool is going to be updated with correct data
-        future_params = cluster.g_query.get_pool_state(
-            stake_pool_id=pool_creation_out.stake_pool_id
-        ).future_pool_params
-        assert not clusterlib_utils.check_pool_data(
-            pool_params=future_params, pool_creation_data=pool_data_updated
-        )
+        pool_state = cluster.g_query.get_pool_state(stake_pool_id=pool_creation_out.stake_pool_id)
+        has_issue_5365 = pool_state.future_pool_params == pool_state.pool_params
+        if not has_issue_5365:
+            assert not clusterlib_utils.check_pool_data(
+                pool_params=pool_state.future_pool_params, pool_creation_data=pool_data_updated
+            )
 
         if cluster.epoch_length_sec <= TWO_HOURS_SEC:
             cluster.wait_for_epoch(epoch_no=update_epoch + 1, padding_seconds=5)
@@ -1482,6 +1484,9 @@ def test_update_stake_pool_metadata(
                 pool_data=pool_data_updated,
             )
 
+        if has_issue_5365:
+            issues.ledger_5365.finish_test()
+
     @allure.link(helpers.get_vcs_link())
     @common.PARAM_BUILD_METHOD_NO_EST
     @pytest.mark.testnets
@@ -1589,12 +1594,12 @@ def test_update_stake_pool_parameters(
             raise ValueError(msg)
 
         # Check that pool is going to be updated with correct data
-        future_params = cluster.g_query.get_pool_state(
-            stake_pool_id=pool_creation_out.stake_pool_id
-        ).future_pool_params
-        assert not clusterlib_utils.check_pool_data(
-            pool_params=future_params, pool_creation_data=pool_data_updated
-        )
+        pool_state = cluster.g_query.get_pool_state(stake_pool_id=pool_creation_out.stake_pool_id)
+        has_issue_5365 = pool_state.future_pool_params == pool_state.pool_params
+        if not has_issue_5365:
+            assert not clusterlib_utils.check_pool_data(
+                pool_params=pool_state.future_pool_params, pool_creation_data=pool_data_updated
+            )
 
         if cluster.epoch_length_sec <= TWO_HOURS_SEC:
             cluster.wait_for_epoch(epoch_no=update_epoch + 1, padding_seconds=5)
@@ -1606,6 +1611,9 @@ def test_update_stake_pool_parameters(
                 pool_data=pool_data_updated,
             )
 
+        if has_issue_5365:
+            issues.ledger_5365.finish_test()
+
     @allure.link(helpers.get_vcs_link())
     @pytest.mark.testnets
     @pytest.mark.smoke

cardano_node_tests/tests/test_tx_many_utxos.py

@@ -115,7 +115,13 @@ def many_utxos(
                         # transactions. This can happen from time to time, we stress
                         # the network here and waiting for 2 blocks may not be enough to get a
                         # transaction through.
-                        if "BadInputsUTxO" not in str(err):
+                        exc_str = str(err)
+                        inputs_spent = (
+                            '(ConwayMempoolFailure "All inputs are spent.'
+                            in exc_str  # In cardano-node >= 10.6.0
+                            or "(BadInputsUTxO" in exc_str
+                        )
+                        if not inputs_spent:
                             raise
                         excp = err
                     else:

cardano_node_tests/tests/test_tx_mempool.py

@@ -89,7 +89,13 @@ def test_query_mempool_txin(
             try:
                 cluster.g_transaction.submit_tx_bare(tx_file=out_file_signed)
             except clusterlib.CLIError as exc:  # noqa: PERF203
-                if r == 0 or "(BadInputsUTxO" not in str(exc):
+                exc_str = str(exc)
+                inputs_spent = (
+                    '(ConwayMempoolFailure "All inputs are spent.'
+                    in exc_str  # In cardano-node >= 10.6.0
+                    or "(BadInputsUTxO" in exc_str
+                )
+                if r == 0 or not inputs_spent:
                     raise
                 break
         else:

cardano_node_tests/tests/test_tx_negative.py

@@ -683,7 +683,11 @@ def test_duplicated_tx(
         # It should NOT be possible to submit a transaction twice
         with pytest.raises(clusterlib.CLIError) as excinfo:
             cluster.g_transaction.submit_tx_bare(out_file_signed)
-        assert "ValueNotConservedUTxO" in str(excinfo.value)
+        exc_str = str(excinfo.value)
+        assert (
+            '(ConwayMempoolFailure "All inputs are spent.' in exc_str  # In cardano-node >= 10.6.0
+            or "(ValueNotConservedUTxO" in exc_str
+        ), exc_str
 
     @allure.link(helpers.get_vcs_link())
     @pytest.mark.smoke
@@ -1149,7 +1153,10 @@ def test_nonexistent_utxo_ix(
                 or "The following tx input(s) were not present in the UTxO" in err
             ), err
         elif build_method == clusterlib_utils.BuildMethods.BUILD_RAW:
-            assert "BadInputsUTxO" in err, err
+            assert (
+                '(ConwayMempoolFailure "All inputs are spent.' in err  # In cardano-node >= 10.6.0
+                or "(BadInputsUTxO" in err
+            ), err
         else:
             msg = f"Unsupported build method: {build_method}"
             raise ValueError(msg)
@@ -1189,7 +1196,10 @@ def test_nonexistent_utxo_hash(
                 or "The following tx input(s) were not present in the UTxO" in err
             ), err
         elif build_method == clusterlib_utils.BuildMethods.BUILD_RAW:
-            assert "BadInputsUTxO" in err, err
+            assert (
+                '(ConwayMempoolFailure "All inputs are spent.' in err  # In cardano-node >= 10.6.0
+                or "(BadInputsUTxO" in err
+            ), err
         else:
             msg = f"Unsupported build method: {build_method}"
             raise ValueError(msg)

cardano_node_tests/tests/tests_conway/test_pparam_update.py

@@ -1153,6 +1153,8 @@ def _check_proposed_pparams(
         )
         fin_approve_epoch = cluster.g_query.get_epoch()
 
+        assert not cluster.g_query.get_future_pparams(), "Future pparams should be empty"
+
         # db-sync check
         [r.start(url=_url) for r in (reqc.cip080, reqc.cip081, reqc.cip082, reqc.cip083)]
         try:
@@ -1202,7 +1204,7 @@ def _check_proposed_pparams(
         )
 
         def _check_state(state: dict):
-            pparams = state.get("curPParams") or state.get("currentPParams") or {}
+            pparams = state.get("curPParams") or state.get("currentPParams") or state or {}
             clusterlib_utils.check_updated_params(
                 update_proposals=fin_update_proposals, protocol_params=pparams
             )
@@ -1277,6 +1279,7 @@ def _check_state(state: dict):
 
             next_rat_state = rat_gov_state["nextRatifyState"]
             _check_state(next_rat_state["nextEnactState"])
+            _check_state(cluster.g_query.get_future_pparams())
             reqc.cip038_04.start(url=helpers.get_vcs_link())
             assert not next_rat_state["ratificationDelayed"], "Ratification is delayed unexpectedly"
             reqc.cip038_04.success()
@@ -1331,6 +1334,8 @@ def _check_state(state: dict):
         if is_spo_total_below_threshold:
             reqc.cip064_04.success()
 
+        assert not cluster.g_query.get_future_pparams(), "Future pparams should be empty"
+
         # db-sync check
         try:
             reqc.db024.start(url=helpers.get_vcs_link())

cardano_node_tests/tests/tests_conway/test_treasury_withdrawals.py

@@ -359,9 +359,9 @@ def _cast_vote(
         voted_votes = _cast_vote(approve=True, vote_id="yes")
         approved_epoch = cluster.g_query.get_epoch()
 
-        treasury_init = clusterlib_utils.get_ledger_state(cluster_obj=cluster)["stateBefore"][
-            "esAccountState"
-        ]["treasury"]
+        treasury_init = clusterlib_utils.get_chain_account_state(
+            ledger_state=clusterlib_utils.get_ledger_state(cluster_obj=cluster)
+        ).treasury
 
         # Check ratification
         rat_epoch = cluster.wait_for_epoch(epoch_no=approved_epoch + 1, padding_seconds=5)
@@ -400,9 +400,9 @@ def _cast_vote(
         assert "(GovActionsDoNotExist" in err_str, err_str
 
         reqc.cip079.start(url=helpers.get_vcs_link())
-        treasury_finish = clusterlib_utils.get_ledger_state(cluster_obj=cluster)["stateBefore"][
-            "esAccountState"
-        ]["treasury"]
+        treasury_finish = clusterlib_utils.get_chain_account_state(
+            ledger_state=clusterlib_utils.get_ledger_state(cluster_obj=cluster)
+        ).treasury
         assert treasury_init != treasury_finish, "Treasury balance didn't change"
         reqc.cip079.success()
 

cardano_node_tests/tests/tests_plutus/spend_build.py

@@ -299,7 +299,12 @@ def _build_spend_locked_txin(  # noqa: C901
             if VERSIONS.transaction_era >= VERSIONS.CONWAY and "(DeserialiseFailure" in str_exc:
                 issues.ledger_4198.finish_test()
             # Check if resubmitting failed because an input UTxO was already spent
-            if "(BadInputsUTxO" not in str_exc:
+            inputs_spent = (
+                '(ConwayMempoolFailure "All inputs are spent.'
+                in str_exc  # In cardano-node >= 10.6.0
+                or "(BadInputsUTxO" in str_exc
+            )
+            if not inputs_spent:
                 raise
         else:
             pytest.fail("Transaction was not submitted successfully")