Merge pull request #868 from IntersectMBO/smelc/remove-non-debug-tran…

…saction-view Remove era|legacy transaction view
IntersectMBO · Sep 24, 2024 · 61dcd88 · 61dcd88
2 parents a157c49 + 93c194b
commit 61dcd88
Show file tree

Hide file tree

Showing 25 changed files with 0 additions and 125 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
@@ -43,7 +43,6 @@ data TransactionCmds era
   | TransactionCalculateMinValueCmd !(TransactionCalculateMinValueCmdArgs era)
   | TransactionHashScriptDataCmd !TransactionHashScriptDataCmdArgs
   | TransactionTxIdCmd !TransactionTxIdCmdArgs
-  | TransactionViewCmd !TransactionViewCmdArgs
 
 data TransactionBuildRawCmdArgs era = TransactionBuildRawCmdArgs
   { eon :: !(ShelleyBasedEra era)
@@ -265,4 +264,3 @@ renderTransactionCmds = \case
   TransactionCalculateMinValueCmd{} -> "transaction calculate-min-value"
   TransactionHashScriptDataCmd{} -> "transaction hash-script-data"
   TransactionTxIdCmd{} -> "transaction txid"
-  TransactionViewCmd{} -> "transaction view"
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
@@ -100,11 +100,6 @@ pTransactionCmds era' envCli =
         subParser "txid" $
           Opt.info pTransactionId $
             Opt.progDesc "Print a transaction identifier."
-    , Just $
-        subParser "view" $
-          Opt.info
-            (pure $ TransactionViewCmd TransactionViewCmdArgs)
-            (Opt.progDesc "This command has been removed. Please use \"debug transaction view\" instead.")
     ]
 
 -- Backwards compatible parsers

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -26,7 +26,6 @@ module Cardano.CLI.EraBased.Run.Transaction
   , runTransactionPolicyIdCmd
   , runTransactionHashScriptDataCmd
   , runTransactionTxIdCmd
-  , runTransactionViewCmd
   , runTransactionWitnessCmd
   , runTransactionSignWitnessCmd
   , toTxOutByronEra
@@ -80,7 +79,6 @@ import qualified Data.Text.IO as Text
 import           Data.Type.Equality (TestEquality (..))
 import           GHC.Exts (IsList (..))
 import           Lens.Micro ((^.))
-import qualified System.Exit as IO
 import qualified System.IO as IO
 
 runTransactionCmds :: Cmd.TransactionCmds era -> ExceptT TxCmdError IO ()
@@ -94,7 +92,6 @@ runTransactionCmds = \case
   Cmd.TransactionCalculateMinValueCmd args -> runTransactionCalculateMinValueCmd args
   Cmd.TransactionHashScriptDataCmd args -> runTransactionHashScriptDataCmd args
   Cmd.TransactionTxIdCmd args -> runTransactionTxIdCmd args
-  Cmd.TransactionViewCmd args -> runTransactionViewCmd args
   Cmd.TransactionPolicyIdCmd args -> runTransactionPolicyIdCmd args
   Cmd.TransactionWitnessCmd args -> runTransactionWitnessCmd args
   Cmd.TransactionSignWitnessCmd args -> runTransactionSignWitnessCmd args
@@ -1702,18 +1699,6 @@ runTransactionTxIdCmd
 
     liftIO $ BS.putStrLn $ serialiseToRawBytesHex (getTxId txbody)
 
-runTransactionViewCmd
-  :: ()
-  => Cmd.TransactionViewCmdArgs
-  -> ExceptT TxCmdError IO ()
-runTransactionViewCmd
-  Cmd.TransactionViewCmdArgs =
-    liftIO $ do
-      IO.hPutStrLn
-        IO.stderr
-        "Command \"era transaction view\" has been removed. Please use \"debug transaction view\" instead."
-      IO.exitWith (IO.ExitFailure 1)
-
 -- ----------------------------------------------------------------------------
 -- Witness commands
 --

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs
@@ -135,7 +135,6 @@ data LegacyTransactionCmds
       ScriptDataOrFile
   | TransactionTxIdCmd
       InputTxBodyOrTxFile
-  | TransactionViewCmd
 
 renderLegacyTransactionCmds :: LegacyTransactionCmds -> Text
 renderLegacyTransactionCmds = \case
@@ -150,4 +149,3 @@ renderLegacyTransactionCmds = \case
   TransactionCalculateMinValueCmd{} -> "transaction calculate-min-value"
   TransactionHashScriptDataCmd{} -> "transaction hash-script-data"
   TransactionTxIdCmd{} -> "transaction txid"
-  TransactionViewCmd{} -> "transaction view"
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -300,9 +300,6 @@ pTransaction envCli =
     , subParser
         "txid"
         (Opt.info pTransactionId $ Opt.progDesc "Print a transaction identifier.")
-    , subParser "view" $
-        Opt.info pTransactionView $
-          Opt.progDesc "This command has been removed. Please use \"debug transaction view\" instead."
     ]
  where
   -- Backwards compatible parsers
@@ -488,10 +485,6 @@ pTransaction envCli =
     TransactionTxIdCmd
       <$> pInputTxOrTxBodyFile
 
-  pTransactionView :: Parser LegacyTransactionCmds
-  pTransactionView =
-    pure TransactionViewCmd
-
 pNodeCmds :: Parser LegacyNodeCmds
 pNodeCmds =
   asum

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs
@@ -157,8 +157,6 @@ runLegacyTransactionCmds = \case
     runLegacyTransactionHashScriptDataCmd scriptDataOrFile
   TransactionTxIdCmd txinfile ->
     runLegacyTransactionTxIdCmd txinfile
-  TransactionViewCmd ->
-    runLegacyTransactionViewCmd
   TransactionPolicyIdCmd sFile ->
     runLegacyTransactionPolicyIdCmd sFile
   TransactionWitnessCmd txBodyfile witSignData mbNw outFile ->
@@ -514,11 +512,6 @@ runLegacyTransactionTxIdCmd txfile =
         txfile
     )
 
-runLegacyTransactionViewCmd :: ExceptT TxCmdError IO ()
-runLegacyTransactionViewCmd =
-  runTransactionViewCmd
-    Cmd.TransactionViewCmdArgs
-
 runLegacyTransactionWitnessCmd
   :: ()
   => TxBodyFile In

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -832,7 +832,6 @@ Usage: cardano-cli shelley transaction
                                          | calculate-min-required-utxo
                                          | hash-script-data
                                          | txid
-                                         | view
                                          )
 
   Transaction commands.
@@ -1081,10 +1080,6 @@ Usage: cardano-cli shelley transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli shelley transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli allegra 
                              ( address
                              | key
@@ -1902,7 +1897,6 @@ Usage: cardano-cli allegra transaction
                                          | calculate-min-required-utxo
                                          | hash-script-data
                                          | txid
-                                         | view
                                          )
 
   Transaction commands.
@@ -2151,10 +2145,6 @@ Usage: cardano-cli allegra transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli allegra transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli mary 
                           ( address
                           | key
@@ -2964,7 +2954,6 @@ Usage: cardano-cli mary transaction
                                       | calculate-min-required-utxo
                                       | hash-script-data
                                       | txid
-                                      | view
                                       )
 
   Transaction commands.
@@ -3211,10 +3200,6 @@ Usage: cardano-cli mary transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli mary transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli alonzo 
                             ( address
                             | key
@@ -4037,7 +4022,6 @@ Usage: cardano-cli alonzo transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands.
@@ -4286,10 +4270,6 @@ Usage: cardano-cli alonzo transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli alonzo transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli babbage 
                              ( address
                              | key
@@ -5135,7 +5115,6 @@ Usage: cardano-cli babbage transaction
                                          | calculate-min-required-utxo
                                          | hash-script-data
                                          | txid
-                                         | view
                                          )
 
   Transaction commands.
@@ -5641,10 +5620,6 @@ Usage: cardano-cli babbage transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli babbage transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli conway 
                             ( address
                             | key
@@ -6952,7 +6927,6 @@ Usage: cardano-cli conway transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands.
@@ -7550,10 +7524,6 @@ Usage: cardano-cli conway transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli conway transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli latest 
                             ( address
                             | key
@@ -8397,7 +8367,6 @@ Usage: cardano-cli latest transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands.
@@ -8903,10 +8872,6 @@ Usage: cardano-cli latest transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli latest transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli legacy Legacy commands
 
   Legacy commands - DEPRECATED - will be removed in the future
@@ -9570,7 +9535,6 @@ Usage: cardano-cli legacy transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands
@@ -9994,10 +9958,6 @@ Usage: cardano-cli legacy transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli legacy transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli legacy key 
                                 ( verification-key
                                 | non-extended-key
@@ -10843,7 +10803,6 @@ Usage: cardano-cli transaction
                                  | calculate-min-required-utxo
                                  | hash-script-data
                                  | txid
-                                 | view
                                  )
 
   Transaction commands
@@ -11253,10 +11212,6 @@ Usage: cardano-cli transaction txid
 
   Print a transaction identifier.
 
-Usage: cardano-cli transaction view 
-
-  This command has been removed. Please use "debug transaction view" instead.
-
 Usage: cardano-cli key 
                          ( verification-key
                          | non-extended-key

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction.cli
@@ -9,7 +9,6 @@ Usage: cardano-cli allegra transaction
                                          | calculate-min-required-utxo
                                          | hash-script-data
                                          | txid
-                                         | view
                                          )
 
   Transaction commands.
@@ -36,5 +35,3 @@ Available commands:
                            output.
   hash-script-data         Calculate the hash of script data.
   txid                     Print a transaction identifier.
-  view                     This command has been removed. Please use "debug
-                           transaction view" instead.
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_view.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_view.cli
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction.cli
@@ -9,7 +9,6 @@ Usage: cardano-cli alonzo transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands.
@@ -36,5 +35,3 @@ Available commands:
                            output.
   hash-script-data         Calculate the hash of script data.
   txid                     Print a transaction identifier.
-  view                     This command has been removed. Please use "debug
-                           transaction view" instead.
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_view.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_view.cli
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction.cli
@@ -11,7 +11,6 @@ Usage: cardano-cli babbage transaction
                                          | calculate-min-required-utxo
                                          | hash-script-data
                                          | txid
-                                         | view
                                          )
 
   Transaction commands.
@@ -44,5 +43,3 @@ Available commands:
                            output.
   hash-script-data         Calculate the hash of script data.
   txid                     Print a transaction identifier.
-  view                     This command has been removed. Please use "debug
-                           transaction view" instead.
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_view.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_view.cli
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction.cli
@@ -11,7 +11,6 @@ Usage: cardano-cli conway transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands.
@@ -44,5 +43,3 @@ Available commands:
                            output.
   hash-script-data         Calculate the hash of script data.
   txid                     Print a transaction identifier.
-  view                     This command has been removed. Please use "debug
-                           transaction view" instead.
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_view.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_view.cli
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction.cli
@@ -11,7 +11,6 @@ Usage: cardano-cli latest transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands.
@@ -44,5 +43,3 @@ Available commands:
                            output.
   hash-script-data         Calculate the hash of script data.
   txid                     Print a transaction identifier.
-  view                     This command has been removed. Please use "debug
-                           transaction view" instead.
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_view.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_view.cli
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction.cli
@@ -10,7 +10,6 @@ Usage: cardano-cli legacy transaction
                                         | calculate-min-required-utxo
                                         | hash-script-data
                                         | txid
-                                        | view
                                         )
 
   Transaction commands
@@ -40,5 +39,3 @@ Available commands:
                            output.
   hash-script-data         Calculate the hash of script data.
   txid                     Print a transaction identifier.
-  view                     This command has been removed. Please use "debug
-                           transaction view" instead.
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_view.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_view.cli