This PR refactors several address registration and multisig tests to align with the new

Author: OlufemiAdeOlusile

cardano_node_tests/tests/common.py

@@ -39,6 +39,11 @@
     ),
 )
 
+SKIPIF_BUILD_EST = pytest.mark.skipif(
+    issues.cli_1199.is_blocked(),
+    reason="BUILD_EST unusable due to cardano-cli bug #1199 (not yet fixed)",
+)
+
 SKIPIF_MISMATCHED_ERAS = pytest.mark.skipif(
     VERSIONS.transaction_era != VERSIONS.cluster_era,
     reason="transaction era must be the same as node era",
@@ -101,6 +106,21 @@
     ),
 )
 
+PARAM_BUILD_METHOD_NO_EST = pytest.mark.parametrize(
+    "build_method",
+    (
+        clusterlib_utils.BuildMethods.BUILD_RAW,
+        pytest.param(
+            clusterlib_utils.BuildMethods.BUILD,
+            marks=SKIPIF_BUILD_UNUSABLE,
+        ),
+        pytest.param(
+            clusterlib_utils.BuildMethods.BUILD_EST,
+            marks=SKIPIF_BUILD_EST,
+        ),
+    ),
+)
+
 PARAM_OFFLINE_BUILD_METHOD = pytest.mark.parametrize(
     "offline_build_method",
     (

cardano_node_tests/tests/test_addr_registration.py

@@ -55,7 +55,7 @@ class TestRegisterAddr:
     """Tests for stake address registration and deregistration."""
 
     @allure.link(helpers.get_vcs_link())
-    @common.PARAM_BUILD_METHOD
+    @common.PARAM_BUILD_METHOD_NO_EST
     @pytest.mark.smoke
     @pytest.mark.testnets
     @pytest.mark.dbsync
@@ -75,12 +75,6 @@ def test_deregister_registered(
         * check that the balance for source address was correctly updated
         * (optional) check records in db-sync
         """
-
-        # skip-known broken path
-        if build_method == clusterlib_utils.BuildMethods.BUILD_EST:
-            pytest.skip("Cannot use BUILD_EST for stake address cert txs (cardano-cli #1199)")
-
-
         temp_template = common.get_test_id(cluster)
 
         user_registered = pool_users_disposable[0]
@@ -148,9 +142,7 @@ def test_deregister_registered(
         ), f"Incorrect balance for source address `{user_payment.address}`"
 
         # Check records in db-sync
-        tx_db_record_reg = dbsync_utils.check_tx(
-            cluster_obj=cluster, tx_raw_output=tx_output_reg
-        )
+        tx_db_record_reg = dbsync_utils.check_tx(cluster_obj=cluster, tx_raw_output=tx_output_reg)
         if tx_db_record_reg:
             assert user_registered.stake.address in tx_db_record_reg.stake_registration
 
@@ -160,10 +152,8 @@ def test_deregister_registered(
         if tx_db_record_dereg:
             assert user_registered.stake.address in tx_db_record_dereg.stake_deregistration
 
-
-
     @allure.link(helpers.get_vcs_link())
-    @common.PARAM_BUILD_METHOD
+    @common.PARAM_BUILD_METHOD_NO_EST
     @pytest.mark.smoke
     @pytest.mark.testnets
     @pytest.mark.dbsync
@@ -174,12 +164,6 @@ def test_addr_registration_deregistration(
         pool_users_disposable: list[clusterlib.PoolUser],
         build_method: str,
     ):
-
-        # skip known-broken build_estimate
-        if build_method == clusterlib_utils.BuildMethods.BUILD_EST:
-            pytest.skip("Cannot use BUILD_EST for stake address cert txs (cardano-cli #1199)")
-
-
         """Submit registration and deregistration certificates in single TX.
 
         * create stake address registration cert
@@ -348,7 +332,7 @@ def test_addr_registration_certificate_order(
             assert user_registered.stake.address in tx_db_record.stake_deregistration
 
     @allure.link(helpers.get_vcs_link())
-    @common.PARAM_BUILD_METHOD
+    @common.PARAM_BUILD_METHOD_NO_EST
     @pytest.mark.parametrize("key_type", ("stake", "payment"))
     @pytest.mark.smoke
     @pytest.mark.testnets
@@ -445,9 +429,6 @@ def _submit_tx(
                     fee=fee,
                 )
 
-            elif build_method == clusterlib_utils.BuildMethods.BUILD_EST:
-                pytest.skip("Cannot use BUILD_EST for multisig stake cert txs (cardano-cli #1199)")
-
             # Create witness file for each key
             witness_files = [
                 cluster.g_transaction.witness_tx(
@@ -582,7 +563,7 @@ def test_register_addr_with_wrong_key(
         assert "MissingVKeyWitnessesUTXOW" in err_msg, err_msg
 
     @allure.link(helpers.get_vcs_link())
-    @common.PARAM_BUILD_METHOD
+    @common.PARAM_BUILD_METHOD_NO_EST
     @pytest.mark.smoke
     @pytest.mark.testnets
     def test_deregister_not_registered_addr(
@@ -611,6 +592,7 @@ def test_deregister_not_registered_addr(
 
         with pytest.raises(clusterlib.CLIError) as excinfo:
             if build_method == clusterlib_utils.BuildMethods.BUILD_RAW:
+
                 def _build_dereg() -> clusterlib.TxRawOutput:
                     return cluster.g_transaction.build_tx(
                         src_address=user_payment.address,
@@ -633,14 +615,12 @@ def _build_dereg() -> clusterlib.TxRawOutput:
                     tx_name=f"{temp_template}_dereg_fail",
                     tx_files=tx_files,
                 )
-            elif build_method == clusterlib_utils.BuildMethods.BUILD_EST:
-                pytest.skip("Cannot use BUILD_EST for stake address cert txs (cardano-cli #1199)")
 
         err_msg = str(excinfo.value)
         assert "StakeKeyNotRegisteredDELEG" in err_msg, err_msg
 
     @allure.link(helpers.get_vcs_link())
-    @common.PARAM_BUILD_METHOD
+    @common.PARAM_BUILD_METHOD_NO_EST
     @pytest.mark.parametrize("issue", ("missing_script", "missing_skey"))
     @pytest.mark.smoke
     @pytest.mark.testnets
@@ -664,10 +644,6 @@ def test_incomplete_multisig(
         * Incrementally sign the Tx and submit the registration certificate
         * Check the expected failure
         """
-
-        if build_method == clusterlib_utils.BuildMethods.BUILD_EST:
-            pytest.skip("Cannot use BUILD_EST for multisig stake cert txs (cardano-cli #1199)")
-
         temp_template = common.get_test_id(cluster)
         payment_addr = pool_users[0].payment