Merge pull request #3162 from IntersectMBO/clean-up-build-cmd

This PR cleans up all build_cmd

Author: mkoura

cardano_node_tests/tests/common.py

@@ -129,16 +129,6 @@
     ),
 )
 
-# Deprecated. Use `PARAM_BUILD_METHOD` instead.
-PARAM_USE_BUILD_CMD = pytest.mark.parametrize(
-    "use_build_cmd",
-    (
-        False,
-        pytest.param(True, marks=SKIPIF_BUILD_UNUSABLE),
-    ),
-    ids=(clusterlib_utils.BuildMethods.BUILD_RAW, clusterlib_utils.BuildMethods.BUILD),
-)
-
 PARAM_PLUTUS_VERSION = pytest.mark.parametrize(
     "plutus_version",
     (

cardano_node_tests/tests/tests_conway/conway_common.py

@@ -117,7 +117,6 @@ def submit_vote(
     keys: list[clusterlib.FileType],
     script_votes: clusterlib.OptionalScriptVotes = (),
     submit_method: str = "",
-    use_build_cmd: bool = True,
     build_method: str = clusterlib_utils.BuildMethods.BUILD,
     witness_count_add: int = 0,
 ) -> clusterlib.TxRawOutput:
@@ -135,7 +134,6 @@ def submit_vote(
         name_template=f"{name_template}_vote",
         src_address=payment_addr.address,
         submit_method=submit_method,
-        use_build_cmd=use_build_cmd,
         build_method=build_method,
         tx_files=tx_files,
         script_votes=script_votes,
@@ -164,7 +162,6 @@ def cast_vote(
     cc_skip_votes: bool = False,
     drep_skip_votes: bool = False,
     spo_skip_votes: bool = False,
-    use_build_cmd: bool = True,
     build_method: str | None = None,
     witness_count_add: int = 0,
 ) -> governance_utils.VotedVotes:
@@ -177,10 +174,7 @@ def cast_vote(
     anchor_data = governance_utils.get_default_anchor_data()
 
     if build_method is None:
-        if use_build_cmd:
-            build_method = clusterlib_utils.BuildMethods.BUILD
-        else:
-            build_method = clusterlib_utils.BuildMethods.BUILD_RAW
+        build_method = clusterlib_utils.BuildMethods.BUILD_RAW
 
     if approve_cc is not None:
         _votes_cc = [
@@ -341,7 +335,7 @@ def resign_ccs(
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_res",
         src_address=payment_addr.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files,
     )
 
@@ -403,7 +397,7 @@ def propose_change_constitution(
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_constitution_action",
         src_address=pool_user.payment.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files,
         fee_buffer=2_000_000,
     )
@@ -478,7 +472,7 @@ def propose_pparams_update(
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_action",
         src_address=pool_user.payment.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files_action,
     )
 

cardano_node_tests/utils/clusterlib_utils.py

@@ -78,7 +78,6 @@ def build_and_submit_tx(
     src_address: str,
     submit_method: str = "",
     build_method: str = "",
-    use_build_cmd: bool = False,  # Deprecated
     txins: clusterlib.OptionalUTXOData = (),
     txouts: clusterlib.OptionalTxOuts = (),
     readonly_reference_txins: clusterlib.OptionalUTXOData = (),
@@ -122,14 +121,11 @@ def build_and_submit_tx(
         * build_raw
         * build_estimate
 
-    Use `use_build_cmd` to switch between `transaction build` and `transaction build-raw`
-    (deprecated).
     """
     tx_files = tx_files or clusterlib.TxFiles()
     submit_method = submit_method or submit_utils.SubmitMethods.CLI
 
-    if not build_method:
-        build_method = BuildMethods.BUILD if use_build_cmd else BuildMethods.BUILD_RAW
+    build_method = build_method or BuildMethods.BUILD_RAW
 
     if build_method == BuildMethods.BUILD_RAW:
         # Resolve withdrawal amounts here (where -1 for total rewards amount is used) so the

cardano_node_tests/utils/governance_setup.py

@@ -75,7 +75,7 @@ def _cast_vote(
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_vote",
         src_address=payment_addr.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files,
     )
 
@@ -429,7 +429,7 @@ def auth_cc_members(
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_cc_auth",
         src_address=payment_addr.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files,
     )
 
@@ -498,7 +498,7 @@ def reinstate_committee(  # noqa: C901
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_action",
         src_address=pool_user.payment.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files_action,
     )
 

cardano_node_tests/utils/governance_utils.py

@@ -732,7 +732,7 @@ def create_dreps(
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_reg",
         src_address=payment_addr.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files,
         deposit=(drep_reg_records[0].deposit + stake_deposit) * len(drep_reg_records),
         destination_dir=destination_dir,
@@ -831,7 +831,7 @@ def create_script_dreps(
         cluster_obj=cluster_obj,
         name_template=f"{name_template}_reg",
         src_address=payment_addr.address,
-        use_build_cmd=True,
+        build_method=clusterlib_utils.BuildMethods.BUILD,
         tx_files=tx_files,
         complex_certs=[
             *[c.registration_cert for c in drep_script_data],