Merge branch 'master' into clean-up-build-cmd

Author: OlufemiAdeOlusile

cardano_node_tests/tests/delegation.py

@@ -246,7 +246,7 @@ def delegate_multisig_stake_addr(
     skey_files: tp.Iterable[clusterlib.FileType],
     pool_id: str = "",
     cold_vkey: pl.Path | None = None,
-    use_build_cmd: bool = False,
+    build_method=clusterlib_utils.BuildMethods.BUILD_RAW,
 ) -> DelegationScriptOut:
     """Submit registration certificate and delegate a multisig stake address to a pool."""
     # Create stake address registration cert if address is not already registered
@@ -296,15 +296,23 @@ def delegate_multisig_stake_addr(
     signing_key_files = [pool_user.payment.skey_file, *skey_files]
     witness_len = len(signing_key_files)
 
-    if use_build_cmd:
+    if build_method == clusterlib_utils.BuildMethods.BUILD:
         tx_output = cluster_obj.g_transaction.build_tx(
             src_address=src_address,
             tx_name=temp_template,
             complex_certs=complex_certs,
             fee_buffer=2_000_000,
             witness_override=witness_len,
         )
-    else:
+    elif build_method == clusterlib_utils.BuildMethods.BUILD_EST:
+        tx_output = cluster_obj.g_transaction.build_estimate_tx(
+            src_address=src_address,
+            tx_name=temp_template,
+            complex_certs=complex_certs,
+            fee_buffer=2_000_000,
+            witness_count_add=witness_len,
+        )
+    elif build_method == clusterlib_utils.BuildMethods.BUILD_RAW:
         fee = cluster_obj.g_transaction.calculate_tx_fee(
             src_address=src_address,
             tx_name=temp_template,
@@ -317,6 +325,9 @@ def delegate_multisig_stake_addr(
             complex_certs=complex_certs,
             fee=fee,
         )
+    else:
+        msg = f"Unsupported build method: {build_method}"
+        raise ValueError(msg)
 
     # Create witness file for each key
     witness_files = [

cardano_node_tests/tests/test_tx_basic.py

@@ -1622,7 +1622,7 @@ def payment_addrs(
         return addrs
 
     @allure.link(helpers.get_vcs_link())
-    @common.PARAM_USE_BUILD_CMD
+    @common.PARAM_BUILD_METHOD_NO_EST
     @submit_utils.PARAM_SUBMIT_METHOD
     @pytest.mark.parametrize("tx_is", ("witnessed", "signed"))
     @pytest.mark.smoke
@@ -1632,7 +1632,7 @@ def test_incremental_signing(
         self,
         cluster: clusterlib.ClusterLib,
         payment_addrs: list[clusterlib.AddressRecord],
-        use_build_cmd: bool,
+        build_method: str,
         tx_is: str,
         submit_method: str,
     ):
@@ -1666,7 +1666,7 @@ def test_incremental_signing(
             signing_key_files=payment_skey_files,
         )
 
-        if use_build_cmd:
+        if build_method == clusterlib_utils.BuildMethods.BUILD:
             tx_output = cluster.g_transaction.build_tx(
                 src_address=src_addr.address,
                 tx_name=temp_template,
@@ -1675,7 +1675,16 @@ def test_incremental_signing(
                 fee_buffer=1_000_000,
                 witness_override=len(payment_skey_files),
             )
-        else:
+        elif build_method == clusterlib_utils.BuildMethods.BUILD_EST:
+            tx_output = cluster.g_transaction.build_estimate_tx(
+                src_address=src_addr.address,
+                tx_name=temp_template,
+                tx_files=tx_files,
+                txouts=txouts,
+                fee_buffer=1_000_000,
+                witness_count_add=len(payment_skey_files),
+            )
+        elif build_method == clusterlib_utils.BuildMethods.BUILD_RAW:
             fee = cluster.g_transaction.calculate_tx_fee(
                 src_address=src_addr.address,
                 tx_name=temp_template,
@@ -1690,6 +1699,9 @@ def test_incremental_signing(
                 tx_files=tx_files,
                 fee=fee,
             )
+        else:
+            msg = f"Unsupported build method: {build_method}"
+            raise ValueError(msg)
 
         # Sign or witness Tx body with part of the skeys and thus create Tx file that will be used
         # for incremental signing

cardano_node_tests/tests/tests_conway/test_treasury_withdrawals.py

@@ -186,7 +186,7 @@ def test_enact_treasury_withdrawals(
                     cluster_obj=cluster,
                     name_template=f"{temp_template}_action_bootstrap",
                     src_address=pool_user_ug_treasury.payment.address,
-                    use_build_cmd=False,
+                    build_method=clusterlib_utils.BuildMethods.BUILD_RAW,
                     tx_files=tx_files_action,
                     deposit=actions_deposit_combined + stake_deposit_amt,
                 )
@@ -201,7 +201,7 @@ def test_enact_treasury_withdrawals(
                     cluster_obj=cluster,
                     name_template=f"{temp_template}_action_build",
                     src_address=pool_user_ug_treasury.payment.address,
-                    use_build_cmd=True,
+                    build_method=clusterlib_utils.BuildMethods.BUILD,
                     tx_files=tx_files_action,
                 )
             err_str = str(excinfo.value)
@@ -221,7 +221,7 @@ def test_enact_treasury_withdrawals(
             submit_method=submit_utils.SubmitMethods.API
             if submit_utils.is_submit_api_available()
             else submit_utils.SubmitMethods.CLI,
-            use_build_cmd=False,
+            build_method=clusterlib_utils.BuildMethods.BUILD_RAW,
             tx_files=tx_files_action,
             deposit=actions_deposit_combined + stake_deposit_amt,
         )

cardano_node_tests/tests/tests_plutus/test_delegation.py

@@ -123,7 +123,7 @@ def register_delegate_stake_addr(
     pool_id: str,
     redeemer_file: pl.Path,
     reference_script_utxos: list[clusterlib.UTXOData] | None,
-    use_build_cmd: bool,
+    build_method: str,
 ) -> tuple[clusterlib.TxRawOutput, list[dict]]:
     """Submit registration certificate and delegate to pool."""
     temp_template = f"{temp_template}_reg_deleg"
@@ -186,7 +186,7 @@ def register_delegate_stake_addr(
             fee_buffer=2_000_000,
             witness_override=len(tx_files.signing_key_files),
         )
-        if use_build_cmd
+        if build_method == clusterlib_utils.BuildMethods.BUILD
         else []
     )
 
@@ -195,7 +195,7 @@ def register_delegate_stake_addr(
         name_template=temp_template,
         src_address=pool_user.payment.address,
         txins=txins,
-        use_build_cmd=use_build_cmd,
+        build_method=build_method,
         tx_files=tx_files,
         complex_certs=[reg_cert_script, deleg_cert_script],
         raw_fee=raw_fee,
@@ -224,7 +224,7 @@ def register_stake_addr(
     pool_user: delegation.PoolUserScript,
     redeemer_file: pl.Path,
     reference_script_utxos: list[clusterlib.UTXOData] | None,
-    use_build_cmd: bool,
+    build_method: str,
 ) -> tuple[clusterlib.TxRawOutput, list[dict]]:
     """Register a stake address."""
     temp_template = f"{temp_template}_reg"
@@ -250,7 +250,7 @@ def register_stake_addr(
     tx_files = clusterlib.TxFiles(signing_key_files=[pool_user.payment.skey_file])
     plutus_costs_reg = []
 
-    if use_build_cmd:
+    if build_method == clusterlib_utils.BuildMethods.BUILD:
         tx_raw_output_reg = cluster_obj.g_transaction.build_tx(
             src_address=pool_user.payment.address,
             tx_name=temp_template,
@@ -309,7 +309,7 @@ def delegate_stake_addr(
     pool_id: str,
     redeemer_file: pl.Path,
     reference_script_utxos: list[clusterlib.UTXOData] | None,
-    use_build_cmd: bool,
+    build_method: str,
 ) -> tuple[clusterlib.TxRawOutput, list[dict]]:
     """Delegate a stake address to a pool."""
     temp_template = f"{temp_template}_deleg"
@@ -335,7 +335,7 @@ def delegate_stake_addr(
     tx_files = clusterlib.TxFiles(signing_key_files=[pool_user.payment.skey_file])
     plutus_costs_deleg = []
 
-    if use_build_cmd:
+    if build_method == clusterlib_utils.BuildMethods.BUILD:
         tx_raw_output_deleg = cluster_obj.g_transaction.build_tx(
             src_address=pool_user.payment.address,
             tx_name=temp_template,
@@ -395,7 +395,7 @@ def deregister_stake_addr(
     pool_user: delegation.PoolUserScript,
     redeemer_file: pl.Path,
     reference_script_utxos: list[clusterlib.UTXOData] | None,
-    use_build_cmd: bool,
+    build_method: str,
 ) -> tuple[clusterlib.TxRawOutput, list[dict]]:
     """Deregister stake address."""
     temp_template = f"{temp_template}_dereg_withdraw"
@@ -434,7 +434,7 @@ def deregister_stake_addr(
 
     plutus_costs = []
 
-    if use_build_cmd:
+    if build_method == clusterlib_utils.BuildMethods.BUILD:
         tx_raw_output = cluster_obj.g_transaction.build_tx(
             src_address=pool_user.payment.address,
             tx_name=temp_template,
@@ -488,7 +488,7 @@ def deregister_stake_addr(
     assert not stake_addr_info.delegation, f"Stake address is still delegated: {stake_addr_info}"
 
     tx_db_dereg = dbsync_utils.check_tx(cluster_obj=cluster_obj, tx_raw_output=tx_raw_output)
-    if tx_db_dereg and use_build_cmd:
+    if tx_db_dereg and build_method == clusterlib_utils.BuildMethods.BUILD:
         assert pool_user.stake.address in tx_db_dereg.stake_deregistration
 
         # Compare cost of Plutus script with data from db-sync
@@ -504,7 +504,7 @@ def deregister_stake_addr(
 # might be already in use.
 @common.SKIPIF_BUILD_UNUSABLE
 @common.PARAM_PLUTUS_VERSION
-@common.PARAM_USE_BUILD_CMD
+@common.PARAM_BUILD_METHOD_NO_EST
 class TestRegisterAddr:
     """Tests for address registration."""
 
@@ -515,7 +515,7 @@ def test_register_deregister(
         cluster_lock_42stake: tuple[clusterlib.ClusterLib, str],
         pool_user: delegation.PoolUserScript,
         plutus_version: str,
-        use_build_cmd: bool,
+        build_method: str,
     ):
         """Register and deregister Plutus script stake address.
 
@@ -615,7 +615,7 @@ def test_register_deregister(
             pool_user=pool_user,
             redeemer_file=plutus_common.REDEEMER_42,
             reference_script_utxos=reference_script_utxos,
-            use_build_cmd=use_build_cmd,
+            build_method=build_method,
         )
 
         tx_db_record_reg = dbsync_utils.check_tx(
@@ -640,7 +640,11 @@ def test_register_deregister(
             pool_user=pool_user,
             redeemer_file=plutus_common.REDEEMER_42,
             reference_script_utxos=reference_script_utxos,
-            use_build_cmd=use_build_cmd and VERSIONS.cli != CLI_WITH_ISSUE_942,
+            build_method=(
+                clusterlib_utils.BuildMethods.BUILD
+                if VERSIONS.cli != CLI_WITH_ISSUE_942
+                else clusterlib_utils.BuildMethods.BUILD_RAW
+            ),
         )
 
         if reward_error:
@@ -651,7 +655,7 @@ def test_register_deregister(
         tx_view.check_tx_view(cluster_obj=cluster, tx_raw_output=tx_raw_output_dereg)
 
         # Compare cost of Plutus script with data from db-sync
-        if tx_db_record_reg and use_build_cmd:
+        if tx_db_record_reg and clusterlib_utils.BuildMethods.BUILD:
             dbsync_utils.check_plutus_costs(
                 redeemer_records=tx_db_record_reg.redeemers, cost_records=plutus_costs_reg
             )
@@ -661,7 +665,7 @@ def test_register_deregister(
 # might be already in use.
 @common.SKIPIF_BUILD_UNUSABLE
 @common.PARAM_PLUTUS_VERSION
-@common.PARAM_USE_BUILD_CMD
+@common.PARAM_BUILD_METHOD
 class TestDelegateAddr:
     """Tests for address delegation to stake pools."""
 
@@ -677,7 +681,7 @@ def test_delegate_deregister(  # noqa: C901
         cluster_lock_42stake: tuple[clusterlib.ClusterLib, str],
         pool_user: delegation.PoolUserScript,
         plutus_version: str,
-        use_build_cmd: bool,
+        build_method: str,
         use_reference_script: bool,
     ):
         """Register, delegate and deregister Plutus script stake address.
@@ -783,7 +787,7 @@ def test_delegate_deregister(  # noqa: C901
                 pool_id=pool_id,
                 redeemer_file=plutus_common.REDEEMER_42,
                 reference_script_utxos=reference_script_utxos,
-                use_build_cmd=use_build_cmd,
+                build_method=build_method,
             )
         except clusterlib.CLIError as exc:
             str_exc = str(exc)
@@ -798,14 +802,14 @@ def test_delegate_deregister(  # noqa: C901
                 issues.cli_297.finish_test()
 
             if (
-                use_build_cmd
+                build_method == clusterlib_utils.BuildMethods.BUILD
                 and "overspent budget" in str_exc
                 and VERSIONS.transaction_era >= VERSIONS.CONWAY
                 and VERSIONS.cli >= version.parse("10.2.0.0")
             ):
                 issues.cli_1023.finish_test()
             elif (
-                use_build_cmd
+                build_method == clusterlib_utils.BuildMethods.BUILD
                 and "overspent budget" in str_exc
                 and VERSIONS.transaction_era >= VERSIONS.CONWAY
             ):
@@ -829,9 +833,9 @@ def test_delegate_deregister(  # noqa: C901
         reward_error = ""
 
         # To speed up test run, skip waiting for rewards in selected scenarios
-        skip_rewards_check = (use_reference_script and not use_build_cmd) or (
-            not use_reference_script and use_build_cmd
-        )
+        skip_rewards_check = (
+            use_reference_script and build_method != clusterlib_utils.BuildMethods.BUILD
+        ) or (not use_reference_script and build_method == clusterlib_utils.BuildMethods.BUILD)
 
         if not skip_rewards_check:
             LOGGER.info("Waiting 4 epochs for first reward.")
@@ -856,7 +860,11 @@ def test_delegate_deregister(  # noqa: C901
                 pool_user=pool_user,
                 redeemer_file=plutus_common.REDEEMER_42,
                 reference_script_utxos=reference_script_utxos,
-                use_build_cmd=use_build_cmd and VERSIONS.cli != CLI_WITH_ISSUE_942,
+                build_method=(
+                    clusterlib_utils.BuildMethods.BUILD
+                    if VERSIONS.cli != CLI_WITH_ISSUE_942
+                    else clusterlib_utils.BuildMethods.BUILD_RAW
+                ),
             )
         except clusterlib.CLIError as exc:
             if "(MissingRedeemers" in str(exc):
@@ -895,7 +903,7 @@ def test_register_delegate_deregister(
         cluster_lock_42stake: tuple[clusterlib.ClusterLib, str],
         pool_user: delegation.PoolUserScript,
         plutus_version: str,
-        use_build_cmd: bool,
+        build_method: str,
     ):
         """Register, delegate and deregister Plutus script stake address.
 
@@ -1007,7 +1015,7 @@ def test_register_delegate_deregister(
             pool_user=pool_user,
             redeemer_file=plutus_common.REDEEMER_42,
             reference_script_utxos=reference_script_utxos,
-            use_build_cmd=use_build_cmd,
+            build_method=build_method,
         )
 
         # Delegate a stake address
@@ -1025,7 +1033,7 @@ def test_register_delegate_deregister(
                 pool_id=pool_id,
                 redeemer_file=plutus_common.REDEEMER_42,
                 reference_script_utxos=reference_script_utxos,
-                use_build_cmd=use_build_cmd,
+                build_method=build_method,
             )
 
             assert cluster.g_query.get_epoch() == init_epoch, (
@@ -1044,7 +1052,7 @@ def test_register_delegate_deregister(
                     pool_user=pool_user,
                     redeemer_file=plutus_common.REDEEMER_42,
                     reference_script_utxos=reference_script_utxos,
-                    use_build_cmd=use_build_cmd,
+                    build_method=build_method,
                 )
 
         tx_db_record_reg = dbsync_utils.check_tx(
@@ -1084,7 +1092,11 @@ def test_register_delegate_deregister(
             pool_user=pool_user,
             redeemer_file=plutus_common.REDEEMER_42,
             reference_script_utxos=reference_script_utxos,
-            use_build_cmd=use_build_cmd and VERSIONS.cli != CLI_WITH_ISSUE_942,
+            build_method=(
+                clusterlib_utils.BuildMethods.BUILD
+                if VERSIONS.cli != CLI_WITH_ISSUE_942
+                else clusterlib_utils.BuildMethods.BUILD_RAW
+            ),
         )
 
         if reward_error:
@@ -1096,11 +1108,11 @@ def test_register_delegate_deregister(
         tx_view.check_tx_view(cluster_obj=cluster, tx_raw_output=tx_raw_output_dereg)
 
         # Compare cost of Plutus script with data from db-sync
-        if tx_db_record_reg and use_build_cmd:
+        if tx_db_record_reg and build_method == clusterlib_utils.BuildMethods.BUILD:
             dbsync_utils.check_plutus_costs(
                 redeemer_records=tx_db_record_reg.redeemers, cost_records=plutus_costs_reg
             )
-        if tx_db_record_deleg and use_build_cmd:
+        if tx_db_record_deleg and build_method == clusterlib_utils.BuildMethods.BUILD:
             dbsync_utils.check_plutus_costs(
                 redeemer_records=tx_db_record_deleg.redeemers, cost_records=plutus_costs_deleg
             )