update compatible tests

Author: OlufemiAdeOlusile

cardano_node_tests/tests/tests_conway/test_pparam_update.py

@@ -1436,27 +1436,16 @@ def test_pparam_keys(
 class TestLegacyProposals:
     """Tests for legacy update proposals in Conway."""
 
-    @pytest.fixture(scope="class")
-    def skip_on_missing_legacy(self) -> None:
-        if not clusterlib_utils.cli_has("legacy governance"):
-            pytest.skip("`legacy governance` commands are not available")
-
     @allure.link(helpers.get_vcs_link())
     @submit_utils.PARAM_SUBMIT_METHOD
     @pytest.mark.smoke
     def test_legacy_proposal_submit(
         self,
-        skip_on_missing_legacy: None,  # noqa: ARG002
         cluster: clusterlib.ClusterLib,
         payment_addr: clusterlib.AddressRecord,
         submit_method: str,
     ):
-        """Test submitting a legacy update proposal in Conway.
-
-        Expect failure as the legacy update proposals are not supported in Conway.
-        """
-        # TODO: convert to use
-        # `compatible babbage governance action create-protocol-parameters-update`
+        """Test that a compatible Babbage pparam proposal cannot be submitted in Conway era."""
         temp_template = common.get_test_id(cluster)
 
         update_proposals = [
@@ -1468,43 +1457,35 @@ def test_legacy_proposal_submit(
         ]
 
         cli_args = clusterlib_utils.get_pparams_update_args(update_proposals=update_proposals)
-        out_file = f"{temp_template}_update.proposal"
 
-        cluster.cli(
-            [
-                "cardano-cli",
-                "legacy",
-                "governance",
-                "create-update-proposal",
-                *cli_args,
-                "--out-file",
-                str(out_file),
-                "--epoch",
-                str(cluster.g_query.get_epoch()),
-                *helpers.prepend_flag(
-                    "--genesis-verification-key-file",
-                    cluster.g_genesis.genesis_keys.genesis_vkeys,
-                ),
-            ],
-            add_default_args=False,
+        # NEW: use compatible babbage pparam action
+        action_file = cluster.g_compatible.babbage.governance.action.gen_pparams_update(
+            name=temp_template,
+            epoch=cluster.g_query.get_epoch(),
+            genesis_vkey_file=cluster.g_genesis.genesis_keys.genesis_vkeys[0],
+            cli_args=cli_args,
         )
 
+        # Submitting a Babbage-era proposal in Conway must fail
         with pytest.raises((clusterlib.CLIError, submit_api.SubmitApiError)) as excinfo:
             clusterlib_utils.build_and_submit_tx(
                 cluster_obj=cluster,
                 name_template=f"{temp_template}_submit_proposal",
                 src_address=payment_addr.address,
                 submit_method=submit_method,
                 tx_files=clusterlib.TxFiles(
-                    proposal_files=[out_file],
+                    proposal_files=[action_file],
                     signing_key_files=[
                         *cluster.g_genesis.genesis_keys.delegate_skeys,
                         pl.Path(payment_addr.skey_file),
                     ],
                 ),
             )
+
         err_str = str(excinfo.value)
-        assert 'TextEnvelopeType "UpdateProposalShelley"' in err_str, err_str
+        assert "era" in err_str or "mismatch" in err_str or "TextEnvelope type error" in err_str, (
+            err_str
+        )
 
     @allure.link(helpers.get_vcs_link())
     @pytest.mark.smoke

cardano_node_tests/tests/tests_conway/test_treasury_withdrawals.py

@@ -716,80 +716,70 @@ def test_expire_treasury_withdrawals(
         [r.success() for r in (reqc.cip032ex, reqc.cip069ex)]
 
 
+@pytest.mark.parametrize("era", ["shelley", "mary", "alonzo", "babbage"])
+@pytest.mark.parametrize(
+    "mir_cert",
+    ("to_treasury", "to_rewards", "treasury_to_addr", "reserves_to_addr"),
+)
 class TestMIRCerts:
-    """Tests for MIR certificates."""
+    """Tests for MIR certificates in all compatible eras."""
 
     @pytest.fixture
-    def payment_addr(
-        self,
-        cluster_manager: cluster_management.ClusterManager,
-        cluster: clusterlib.ClusterLib,
-    ) -> clusterlib.AddressRecord:
-        """Create new payment address."""
-        addr = common.get_payment_addr(
+    def payment_addr(self, cluster_manager, cluster):
+        return common.get_payment_addr(
             name_template=common.get_test_id(cluster),
             cluster_manager=cluster_manager,
             cluster_obj=cluster,
             caching_key=helpers.get_current_line_str(),
             amount=4_000_000,
         )
-        return addr
 
     @allure.link(helpers.get_vcs_link())
-    @pytest.mark.parametrize(
-        "mir_cert", ("to_treasury", "to_rewards", "treasury_to_addr", "reserves_to_addr")
-    )
     @pytest.mark.smoke
-    def test_mir_certificates(
-        self,
-        cluster: clusterlib.ClusterLib,
-        payment_addr: clusterlib.AddressRecord,
-        mir_cert: str,
-    ):
-        """Try to use MIR certificates in Conway+ eras.
-
-        Expect failure.
+    def test_mir_certificates(self, cluster, payment_addr, era, mir_cert):
+        """
+        Try each MIR certificate across all compatible eras.
 
-        * try and fail to build the Tx using `transaction build`
-        * successfully build the Tx as Babbage Tx using compatible `signed-transaction`
-        * try and fail to submit the Babbage Tx (expected era mismatch)
+        Expected behavior:
+        * Conway build fails with MIR (TextEnvelope type error)
+        * Compatible <era> signed-transaction builds successfully
+        * Submitting a non-Conway tx in Conway must fail (era mismatch)
         """
         temp_template = common.get_test_id(cluster)
         amount = 1_500_000
 
         reqc.cip070.start(url=helpers.get_vcs_link())
 
-        # Generate MIR certificate using compatible governance commands
+        # Get compatible governance for selected era dynamically
+        gov = getattr(cluster.g_compatible, era).governance
+
+        # Generate cert based on MIR type
         if mir_cert == "to_treasury":
-            cert_file = cluster.g_compatible.babbage.governance.gen_mir_cert(
+            cert_file = gov.gen_mir_cert_to_treasury(
                 name=temp_template,
-                subcommand="transfer-to-treasury",
-                transfer_amt=amount,
+                transfer=amount,
             )
         elif mir_cert == "to_rewards":
-            cert_file = cluster.g_compatible.babbage.governance.gen_mir_cert(
+            cert_file = gov.gen_mir_cert_to_rewards(
                 name=temp_template,
-                subcommand="transfer-to-rewards",
-                transfer_amt=amount,
+                transfer=amount,
             )
         elif mir_cert == "treasury_to_addr":
-            cert_file = cluster.g_compatible.babbage.governance.gen_mir_cert(
+            cert_file = gov.gen_mir_cert_stake_addr(
                 name=temp_template,
-                subcommand="stake-addresses",
                 stake_address="stake_test1uzy5myemjnne3gr0jp7yhtznxx2lvx4qgv730jktsu46v5gaw7rmt",
                 reward=amount,
-                funds="treasury",
+                use_treasury=True,
             )
         elif mir_cert == "reserves_to_addr":
-            cert_file = cluster.g_compatible.babbage.governance.gen_mir_cert(
+            cert_file = gov.gen_mir_cert_stake_addr(
                 name=temp_template,
-                subcommand="stake-addresses",
                 stake_address="stake_test1uzy5myemjnne3gr0jp7yhtznxx2lvx4qgv730jktsu46v5gaw7rmt",
                 reward=amount,
-                funds="reserves",
+                use_treasury=False,
             )
         else:
-            msg = f"Unknown MIR certificate: {mir_cert}"
+            msg = f"Unknown MIR certificate type: {mir_cert}"
             raise ValueError(msg)
 
         tx_files = clusterlib.TxFiles(
@@ -800,33 +790,33 @@ def test_mir_certificates(
             ],
         )
 
-        # Conway cannot build MIR Tx using the Conway `build` command, expect failure
+        # Conway build MUST fail
         with pytest.raises(clusterlib.CLIError) as excinfo:
             cluster.g_transaction.build_tx(
                 tx_name=temp_template,
                 src_address=payment_addr.address,
                 tx_files=tx_files,
             )
-        err_build = str(excinfo.value)
-        assert "TextEnvelope type error:" in err_build, err_build
+        assert "TextEnvelope type error" in str(excinfo.value)
 
-        # Build a Babbage-era signed Tx using compatible signed-transaction
-        signed_tx = cluster.g_compatible.babbage.transaction.gen_signed_tx(
+        # Build signed tx using compatible <era> transaction command
+        tx_builder = getattr(cluster.g_compatible, era).transaction
+        signed_tx = tx_builder.gen_signed_tx(
             name=temp_template,
             src_address=payment_addr.address,
             txouts=[],
             tx_files=tx_files,
             fee=400_000,
         )
 
-        # Submitting this Babbage Tx in Conway should fail (era mismatch expected)
+        # Submitting non-Conway tx in Conway MUST fail
         with pytest.raises(clusterlib.CLIError) as excinfo:
             cluster.g_transaction.submit_tx(
                 tx_file=signed_tx.out_file,
                 txins=signed_tx.txins,
             )
-        err_submit = str(excinfo.value)
-        assert "era" in err_submit or "mismatch" in err_submit, err_submit
+        err = str(excinfo.value)
+        assert "era" in err or "mismatch" in err
 
         reqc.cip070.success()