Should be removed

IntersectMBO · Jan 31, 2025 · 7f29e2f · 7f29e2f
1 parent 1ef645d
commit 7f29e2f
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 18 deletions.
diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/ErrorsSpec.hs
@@ -234,10 +234,9 @@ test_VoteReadError =
     ,
       ( "GovernanceVoteCmdReadVoteFileError"
       , GovernanceVoteCmdReadVoteFileError $
-          VoteErrorFile $
-            FileError "path/file.txt" $
-              TextEnvelopeError $
-                TextEnvelopeAesonDecodeError "some error description"
+          FileError "path/file.txt" $
+            TextEnvelopeError $
+              TextEnvelopeAesonDecodeError "some error description"
       )
     ,
       ( "GovernanceVoteCmdWriteError"

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -8245,7 +8245,9 @@ Usage: cardano-cli conway transaction build-raw
                                                         )
                                                         --vote-execution-units (INT, INT)]
                                                     | --vote-tx-in-reference TX-IN
-                                                      --vote-plutus-script-v3
+                                                      ( --vote-plutus-script-v2
+                                                      | --vote-plutus-script-v3
+                                                      )
                                                       ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                       | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                       | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -8399,7 +8401,9 @@ Usage: cardano-cli conway transaction build
                                                   | --vote-redeemer-value JSON_VALUE
                                                   ]
                                                 | --vote-tx-in-reference TX-IN
-                                                  --vote-plutus-script-v3
+                                                  ( --vote-plutus-script-v2
+                                                  | --vote-plutus-script-v3
+                                                  )
                                                   ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                   | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                   | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -8562,7 +8566,9 @@ Usage: cardano-cli conway transaction build-estimate
                                                              )
                                                              --vote-execution-units (INT, INT)]
                                                          | --vote-tx-in-reference TX-IN
-                                                           --vote-plutus-script-v3
+                                                           ( --vote-plutus-script-v2
+                                                           | --vote-plutus-script-v3
+                                                           )
                                                            ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                            | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                            | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -10300,7 +10306,9 @@ Usage: cardano-cli latest transaction build-raw
                                                         )
                                                         --vote-execution-units (INT, INT)]
                                                     | --vote-tx-in-reference TX-IN
-                                                      --vote-plutus-script-v3
+                                                      ( --vote-plutus-script-v2
+                                                      | --vote-plutus-script-v3
+                                                      )
                                                       ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                       | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                       | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -10454,7 +10462,9 @@ Usage: cardano-cli latest transaction build
                                                   | --vote-redeemer-value JSON_VALUE
                                                   ]
                                                 | --vote-tx-in-reference TX-IN
-                                                  --vote-plutus-script-v3
+                                                  ( --vote-plutus-script-v2
+                                                  | --vote-plutus-script-v3
+                                                  )
                                                   ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                   | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                   | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -10617,7 +10627,9 @@ Usage: cardano-cli latest transaction build-estimate
                                                              )
                                                              --vote-execution-units (INT, INT)]
                                                          | --vote-tx-in-reference TX-IN
-                                                           --vote-plutus-script-v3
+                                                           ( --vote-plutus-script-v2
+                                                           | --vote-plutus-script-v3
+                                                           )
                                                            ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                            | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                            | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -11715,7 +11727,9 @@ Usage: cardano-cli compatible conway transaction signed-transaction
                                                                             )
                                                                             --vote-execution-units (INT, INT)]
                                                                         | --vote-tx-in-reference TX-IN
-                                                                          --vote-plutus-script-v3
+                                                                          ( --vote-plutus-script-v2
+                                                                          | --vote-plutus-script-v3
+                                                                          )
                                                                           ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                                           | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                                           | --vote-reference-tx-in-redeemer-value JSON_VALUE

diff --git a/...cardano-cli-golden/files/golden/help/compatible_conway_transaction_signed-transaction.cli b/...cardano-cli-golden/files/golden/help/compatible_conway_transaction_signed-transaction.cli
@@ -38,7 +38,9 @@ Usage: cardano-cli compatible conway transaction signed-transaction
                                                                             )
                                                                             --vote-execution-units (INT, INT)]
                                                                         | --vote-tx-in-reference TX-IN
-                                                                          --vote-plutus-script-v3
+                                                                          ( --vote-plutus-script-v2
+                                                                          | --vote-plutus-script-v3
+                                                                          )
                                                                           ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                                           | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                                           | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -172,6 +174,7 @@ Available options:
   --vote-tx-in-reference TX-IN
                            TxId#TxIx - Specify a reference input. The reference
                            input must have a plutus reference script attached.
+  --vote-plutus-script-v2  Specify a plutus script v2 reference script.
   --vote-plutus-script-v3  Specify a plutus script v3 reference script.
   --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                            The script redeemer file. The file has to be in CBOR

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli
@@ -133,7 +133,9 @@ Usage: cardano-cli conway transaction build-estimate
                                                              )
                                                              --vote-execution-units (INT, INT)]
                                                          | --vote-tx-in-reference TX-IN
-                                                           --vote-plutus-script-v3
+                                                           ( --vote-plutus-script-v2
+                                                           | --vote-plutus-script-v3
+                                                           )
                                                            ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                            | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                            | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -462,6 +464,7 @@ Available options:
   --vote-tx-in-reference TX-IN
                            TxId#TxIx - Specify a reference input. The reference
                            input must have a plutus reference script attached.
+  --vote-plutus-script-v2  Specify a plutus script v2 reference script.
   --vote-plutus-script-v3  Specify a plutus script v3 reference script.
   --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                            The script redeemer file. The file has to be in CBOR

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli
@@ -128,7 +128,9 @@ Usage: cardano-cli conway transaction build-raw
                                                         )
                                                         --vote-execution-units (INT, INT)]
                                                     | --vote-tx-in-reference TX-IN
-                                                      --vote-plutus-script-v3
+                                                      ( --vote-plutus-script-v2
+                                                      | --vote-plutus-script-v3
+                                                      )
                                                       ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                       | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                       | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -446,6 +448,7 @@ Available options:
   --vote-tx-in-reference TX-IN
                            TxId#TxIx - Specify a reference input. The reference
                            input must have a plutus reference script attached.
+  --vote-plutus-script-v2  Specify a plutus script v2 reference script.
   --vote-plutus-script-v3  Specify a plutus script v3 reference script.
   --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                            The script redeemer file. The file has to be in CBOR

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli
@@ -121,7 +121,9 @@ Usage: cardano-cli conway transaction build
                                                   | --vote-redeemer-value JSON_VALUE
                                                   ]
                                                 | --vote-tx-in-reference TX-IN
-                                                  --vote-plutus-script-v3
+                                                  ( --vote-plutus-script-v2
+                                                  | --vote-plutus-script-v3
+                                                  )
                                                   ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                   | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                   | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -431,6 +433,7 @@ Available options:
   --vote-tx-in-reference TX-IN
                            TxId#TxIx - Specify a reference input. The reference
                            input must have a plutus reference script attached.
+  --vote-plutus-script-v2  Specify a plutus script v2 reference script.
   --vote-plutus-script-v3  Specify a plutus script v3 reference script.
   --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                            The script redeemer file. The file has to be in CBOR

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-estimate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-estimate.cli
@@ -133,7 +133,9 @@ Usage: cardano-cli latest transaction build-estimate
                                                              )
                                                              --vote-execution-units (INT, INT)]
                                                          | --vote-tx-in-reference TX-IN
-                                                           --vote-plutus-script-v3
+                                                           ( --vote-plutus-script-v2
+                                                           | --vote-plutus-script-v3
+                                                           )
                                                            ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                            | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                            | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -462,6 +464,7 @@ Available options:
   --vote-tx-in-reference TX-IN
                            TxId#TxIx - Specify a reference input. The reference
                            input must have a plutus reference script attached.
+  --vote-plutus-script-v2  Specify a plutus script v2 reference script.
   --vote-plutus-script-v3  Specify a plutus script v3 reference script.
   --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                            The script redeemer file. The file has to be in CBOR

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-raw.cli
@@ -128,7 +128,9 @@ Usage: cardano-cli latest transaction build-raw
                                                         )
                                                         --vote-execution-units (INT, INT)]
                                                     | --vote-tx-in-reference TX-IN
-                                                      --vote-plutus-script-v3
+                                                      ( --vote-plutus-script-v2
+                                                      | --vote-plutus-script-v3
+                                                      )
                                                       ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                       | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                       | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -446,6 +448,7 @@ Available options:
   --vote-tx-in-reference TX-IN
                            TxId#TxIx - Specify a reference input. The reference
                            input must have a plutus reference script attached.
+  --vote-plutus-script-v2  Specify a plutus script v2 reference script.
   --vote-plutus-script-v3  Specify a plutus script v3 reference script.
   --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                            The script redeemer file. The file has to be in CBOR

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build.cli
@@ -121,7 +121,9 @@ Usage: cardano-cli latest transaction build
                                                   | --vote-redeemer-value JSON_VALUE
                                                   ]
                                                 | --vote-tx-in-reference TX-IN
-                                                  --vote-plutus-script-v3
+                                                  ( --vote-plutus-script-v2
+                                                  | --vote-plutus-script-v3
+                                                  )
                                                   ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                                                   | --vote-reference-tx-in-redeemer-file JSON_FILE
                                                   | --vote-reference-tx-in-redeemer-value JSON_VALUE
@@ -431,6 +433,7 @@ Available options:
   --vote-tx-in-reference TX-IN
                            TxId#TxIx - Specify a reference input. The reference
                            input must have a plutus reference script attached.
+  --vote-plutus-script-v2  Specify a plutus script v2 reference script.
   --vote-plutus-script-v3  Specify a plutus script v3 reference script.
   --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE
                            The script redeemer file. The file has to be in CBOR