diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs index 62e359db9b..c6171d10dc 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs @@ -42,7 +42,6 @@ data TransactionCmds era | TransactionCalculateMinValueCmd !(TransactionCalculateMinValueCmdArgs era) | TransactionHashScriptDataCmd !TransactionHashScriptDataCmdArgs | TransactionTxIdCmd !TransactionTxIdCmdArgs - | TransactionViewCmd !TransactionViewCmdArgs data TransactionBuildRawCmdArgs era = TransactionBuildRawCmdArgs { eon :: !(ShelleyBasedEra era) @@ -264,4 +263,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 index c503b64986..8f23895aa5 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs @@ -97,11 +97,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 index a1261e89f0..5f3e4072ba 100644 --- 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 @@ -79,7 +78,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 () @@ -93,7 +91,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 @@ -1698,18 +1695,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 index 8c8684cc9c..39f0684a86 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs @@ -134,7 +134,6 @@ data LegacyTransactionCmds ScriptDataOrFile | TransactionTxIdCmd InputTxBodyOrTxFile - | TransactionViewCmd renderLegacyTransactionCmds :: LegacyTransactionCmds -> Text renderLegacyTransactionCmds = \case @@ -149,4 +148,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 index 115ab0fcc2..db852ffd6e 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs @@ -298,9 +298,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 @@ -486,10 +483,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 index 11cb62998b..5a08d8e05e 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs @@ -152,8 +152,6 @@ runLegacyTransactionCmds = \case runLegacyTransactionHashScriptDataCmd scriptDataOrFile TransactionTxIdCmd txinfile -> runLegacyTransactionTxIdCmd txinfile - TransactionViewCmd -> - runLegacyTransactionViewCmd TransactionPolicyIdCmd sFile -> runLegacyTransactionPolicyIdCmd sFile TransactionWitnessCmd txBodyfile witSignData mbNw outFile -> @@ -508,11 +506,6 @@ runLegacyTransactionTxIdCmd txfile = txfile ) -runLegacyTransactionViewCmd :: ExceptT TxCmdError IO () -runLegacyTransactionViewCmd = - runTransactionViewCmd - Cmd.TransactionViewCmdArgs - runLegacyTransactionWitnessCmd :: () => TxBodyFile In