transaction id: do not tie implementation with default of parser

IntersectMBO · Jan 13, 2025 · b83358e · b83358e
1 parent f8d55ee
commit b83358e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
@@ -245,7 +245,7 @@ newtype TransactionHashScriptDataCmdArgs = TransactionHashScriptDataCmdArgs
 
 data TransactionTxIdCmdArgs = TransactionTxIdCmdArgs
   { inputTxBodyOrTxFile :: InputTxBodyOrTxFile
-  , outputFormat :: !(Maybe OutputFormatJsonOrText)
+  , outputFormat :: !OutputFormatJsonOrText
   }
   deriving Show
 

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -1727,10 +1727,8 @@ pOutputFormatJsonOrText kind =
 -- to write @transaction txid@'s output on standard output.
 pTxIdOutputFormatJsonOrText :: Parser OutputFormatJsonOrText
 pTxIdOutputFormatJsonOrText =
-  asum
-    [ make OutputFormatJson "JSON" "json"
-    , make OutputFormatText "TEXT" "text"
-    ]
+  asum [make OutputFormatJson "JSON" "json", make OutputFormatText "TEXT" "text"]
+    <|> pure default_
  where
   default_ = OutputFormatText
   make format desc flag_ =

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
@@ -379,4 +379,4 @@ pTransactionId =
   fmap TransactionTxIdCmd $
     TransactionTxIdCmdArgs
       <$> pInputTxOrTxBodyFile
-      <*> optional pTxIdOutputFormatJsonOrText
+      <*> pTxIdOutputFormatJsonOrText
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -1748,15 +1748,11 @@ runTransactionTxIdCmd
           return . InAnyShelleyBasedEra era $ getTxBody tx
 
     let txId = getTxId txbody
-        bsToWrite = serialiseToRawBytesHex txId
 
     liftIO $
       case outputFormat of
-        Just OutputFormatJson -> LBS.putStrLn $ Aeson.encode $ TxSubmissionResult txId
-        Just OutputFormatText -> BS.putStrLn bsToWrite
-        Nothing ->
-          -- Stay compatible with output when there was no --output-format flag
-          BS.putStrLn bsToWrite
+        OutputFormatJson -> LBS.putStrLn $ Aeson.encode $ TxSubmissionResult txId
+        OutputFormatText -> BS.putStrLn $ serialiseToRawBytesHex txId
 
 -- ----------------------------------------------------------------------------
 -- Witness commands