Fixes needed after making CDDL format default

See IntersectMBO/cardano-node#4303

Author: mkoura

cardano_node_tests/tests/test_native_tokens.py

@@ -2222,11 +2222,13 @@ def test_multiasset_txouts_syntax(
             txout_str,
             "--mint",
             mint_str,
-            "--cddl-format" if cluster.use_cddl else "--cli-format",
             "--out-file",
             str(out_file),
         ]
 
+        if cluster.use_cddl:
+            build_raw_args.append("--cddl-format")
+
         # build transaction body
         cluster.cli(build_raw_args)
 

cardano_node_tests/tests/test_shelley_cddl.py

@@ -30,6 +30,11 @@
     reason="runs only with Shelley TX",
 )
 class TestShelleyCDDL:
+    @pytest.fixture(scope="class")
+    def skip_cddl(self):
+        if not clusterlib_utils.cli_has("transaction build-raw --cddl-format"):
+            pytest.skip("The `--cddl-format` option is no longer available.")
+
     @pytest.fixture
     def payment_addrs(
         self,
@@ -56,9 +61,13 @@ def payment_addrs(
 
     @allure.link(helpers.get_vcs_link())
     def test_shelley_cddl(
-        self, cluster: clusterlib.ClusterLib, payment_addrs: List[clusterlib.AddressRecord]
+        self,
+        skip_cddl: None,
+        cluster: clusterlib.ClusterLib,
+        payment_addrs: List[clusterlib.AddressRecord],
     ):
         """Check expected failure when Shelley Tx is used with CDDL format."""
+        # pylint: disable=unused-argument
         temp_template = common.get_test_id(cluster)
 
         src_address = payment_addrs[0].address

cardano_node_tests/tests/test_transactions.py

@@ -3114,7 +3114,7 @@ def test_sign_wrong_file(
         # combination is used
         # TODO: move this tests from `TestNegative` once CDDL is the only supported format
         # of Tx body
-        if cluster.use_cddl:
+        if cluster.use_cddl or not clusterlib_utils.cli_has("transaction build-raw --cddl-format"):
             tx_signed_again = cluster.sign_tx(
                 **cli_args,
                 signing_key_files=tx_files.signing_key_files,