Merge branch 'main' into cl/conway-user-stories

README.md

@@ -30,4 +30,4 @@ See the [Contributing guide](CONTRIBUTING.md) for how to contribute to this proj
 
 Development documentation can be found in [Cardano Node Wiki](https://github.com/input-output-hk/cardano-node-wiki/wiki).
 
-Haddock documentation is available at: https://input-output-hk.github.io/cardano-cli/
+Haddock documentation is available at: https://cardano-cli.cardano.intersectmbo.org/

cabal.project

@@ -1,6 +1,6 @@
 -- Custom repository for cardano haskell packages, see CONTRIBUTING for more
 repository cardano-haskell-packages
-  url: https://input-output-hk.github.io/cardano-haskell-packages
+  url: https://chap.intersectmbo.org/
   secure: True
   root-keys:
     3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f

cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs

@@ -132,7 +132,7 @@ data GovernanceActionViewCmdArgs era
   = GovernanceActionViewCmdArgs
       { eon        :: !(ConwayEraOnwards era)
       , actionFile :: !(ProposalFile In)
-      , outFormat  :: !GovernanceActionViewOutputFormat
+      , outFormat  :: !ViewOutputFormat
       , mOutFile   :: !(Maybe (File () Out))
       } deriving Show
 

cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs

@@ -39,7 +39,7 @@ data GovernanceVoteCreateCmdArgs era
 data GovernanceVoteViewCmdArgs era
   = GovernanceVoteViewCmdArgs
       { eon         :: ConwayEraOnwards era
-      , yamlOutput  :: Bool
+      , outFormat  :: !ViewOutputFormat
       , voteFile    :: VoteFile In
       , mOutFile    :: Maybe (File () Out)
       }

cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs

@@ -182,7 +182,7 @@ newtype TransactionTxIdCmdArgs = TransactionTxIdCmdArgs
   } deriving Show
 
 data TransactionViewCmdArgs = TransactionViewCmdArgs
-  { outputFormat        :: !TxViewOutputFormat
+  { outputFormat        :: !ViewOutputFormat
   , mOutFile            :: !(Maybe (File () Out))
   , inputTxBodyOrTxFile :: !InputTxBodyOrTxFile
   } deriving Show

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -1566,29 +1566,30 @@ pPoolIdOutputFormat =
     , Opt.value IdOutputFormatBech32
     ]
 
-pTxViewOutputFormat :: Parser TxViewOutputFormat
-pTxViewOutputFormat =
-  Opt.option readTxViewOutputFormat $ mconcat
-    [ Opt.long "output-format"
-    , Opt.metavar "STRING"
-    , Opt.help $ mconcat
-      [ "Optional transaction view output format. Accepted output formats are \"json\" "
-      , "and \"yaml\" (default is \"json\")."
-      ]
-    , Opt.value TxViewOutputFormatJson
-    ]
+pTxViewOutputFormat :: Parser ViewOutputFormat
+pTxViewOutputFormat = pViewOutputFormat "transaction"
 
-pGovernanceActionViewOutputFormat :: Parser GovernanceActionViewOutputFormat
-pGovernanceActionViewOutputFormat =
-  Opt.option readGovernanceActionViewOutputFormat $ mconcat
-    [ Opt.long "output-format"
-    , Opt.metavar "STRING"
-    , Opt.help $ mconcat
-      [ "Optional governance action view output format. Accepted output formats are \"json\" "
-      , "and \"yaml\" (default is \"json\")."
-      ]
-    , Opt.value GovernanceActionViewOutputFormatJson
+pGovernanceActionViewOutputFormat :: Parser ViewOutputFormat
+pGovernanceActionViewOutputFormat = pViewOutputFormat "governance action"
+
+pGovernanceVoteViewOutputFormat :: Parser ViewOutputFormat
+pGovernanceVoteViewOutputFormat = pViewOutputFormat "governance vote"
+
+-- | @pViewOutputFormat kind@ is a parser to specify in which format
+-- to view some data (json or yaml). @what@ is the kind of data considered.
+pViewOutputFormat :: String -> Parser ViewOutputFormat
+pViewOutputFormat kind =
+  asum
+    [ make ViewOutputFormatJson "JSON" "json" Nothing
+    , make ViewOutputFormatYaml "YAML" "yaml" (Just " Defaults to JSON if unspecified.")
     ]
+  where
+    make format desc flag_ extraHelp =
+      Opt.flag ViewOutputFormatJson format $ mconcat
+      [ Opt.help $
+          "Format " <> kind <> " view output to " <> desc <> "."
+            <> fromMaybe "" extraHelp
+      , Opt.long ("output-" <> flag_)]
 
 pMaybeOutputFile :: Parser (Maybe (File content Out))
 pMaybeOutputFile =

cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs

@@ -70,13 +70,6 @@ pGovernanceVoteViewCmd era = do
 pGovernanceVoteViewCmdArgs :: ConwayEraOnwards era -> Parser (GovernanceVoteViewCmdArgs era)
 pGovernanceVoteViewCmdArgs cOnwards =
   GovernanceVoteViewCmdArgs cOnwards
-    <$> pYamlOutput
+    <$> pGovernanceVoteViewOutputFormat
     <*> pFileInDirection "vote-file" "Input filepath of the vote."
     <*> pMaybeOutputFile
-  where
-    pYamlOutput :: Parser Bool
-    pYamlOutput =
-      Opt.switch
-        ( Opt.long "yaml"
-            <> Opt.help "Output vote in YAML format (and not JSON)."
-        )

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs

@@ -71,8 +71,8 @@ runGovernanceActionViewCmd
   firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $
     friendlyProposal
       (case outFormat of
-        GovernanceActionViewOutputFormatJson -> FriendlyJson
-        GovernanceActionViewOutputFormatYaml -> FriendlyYaml)
+        ViewOutputFormatJson -> FriendlyJson
+        ViewOutputFormatYaml -> FriendlyYaml)
       mOutFile
       eon
       proposal

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs

@@ -85,7 +85,7 @@ runGovernanceVoteViewCmd :: ()
 runGovernanceVoteViewCmd
     Cmd.GovernanceVoteViewCmdArgs
       { eon
-      , yamlOutput
+      , outFormat
       , voteFile
       , mOutFile
       } = do
@@ -96,8 +96,12 @@ runGovernanceVoteViewCmd
      readVotingProceduresFile eon voteFile
     firstExceptT GovernanceVoteCmdWriteError .
       newExceptT .
-      (if yamlOutput
-      then writeByteStringOutput mOutFile . Yaml.encodePretty (Yaml.setConfCompare compare Yaml.defConfig)
-      else writeLazyByteStringOutput mOutFile . encodePretty' (defConfig {confCompare = compare})) .
+      (case outFormat of
+         ViewOutputFormatYaml ->
+           writeByteStringOutput mOutFile . Yaml.encodePretty
+             (Yaml.setConfCompare compare Yaml.defConfig)
+         ViewOutputFormatJson ->
+           writeLazyByteStringOutput mOutFile . encodePretty'
+             (defConfig {confCompare = compare})) .
       unVotingProcedures $
-      voteProcedures
+      voteProcedures

cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs

@@ -1189,15 +1189,15 @@ runTransactionViewCmd
       -- is arguably not part of the transaction body.
       firstExceptT TxCmdWriteFileError . newExceptT $
         case outputFormat of
-          TxViewOutputFormatYaml -> friendlyTxBody FriendlyYaml mOutFile (toCardanoEra era) txbody
-          TxViewOutputFormatJson -> friendlyTxBody FriendlyJson mOutFile (toCardanoEra era) txbody
+          ViewOutputFormatYaml -> friendlyTxBody FriendlyYaml mOutFile (toCardanoEra era) txbody
+          ViewOutputFormatJson -> friendlyTxBody FriendlyJson mOutFile (toCardanoEra era) txbody
     InputTxFile (File txFilePath) -> do
       txFile <- liftIO $ fileOrPipe txFilePath
       InAnyShelleyBasedEra era tx <- lift (readFileTx txFile) & onLeft (left . TxCmdCddlError)
       firstExceptT TxCmdWriteFileError . newExceptT $
         case outputFormat of
-          TxViewOutputFormatYaml -> friendlyTx FriendlyYaml mOutFile (toCardanoEra era) tx
-          TxViewOutputFormatJson -> friendlyTx FriendlyJson mOutFile (toCardanoEra era) tx
+          ViewOutputFormatYaml -> friendlyTx FriendlyYaml mOutFile (toCardanoEra era) tx
+          ViewOutputFormatJson -> friendlyTx FriendlyJson mOutFile (toCardanoEra era) tx
 
 -- ----------------------------------------------------------------------------
 -- Witness commands

cardano-cli/src/Cardano/CLI/Legacy/Commands/Transaction.hs

@@ -131,7 +131,7 @@ data LegacyTransactionCmds
   | TransactionTxIdCmd
       InputTxBodyOrTxFile
   | TransactionViewCmd
-      TxViewOutputFormat
+      ViewOutputFormat
       (Maybe (File () Out))
       InputTxBodyOrTxFile
 

cardano-cli/src/Cardano/CLI/Legacy/Run/Transaction.hs

@@ -287,7 +287,7 @@ runLegacyTransactionTxIdCmd txfile =
         txfile
     )
 
-runLegacyTransactionViewCmd :: TxViewOutputFormat -> Maybe (File () Out) -> InputTxBodyOrTxFile -> ExceptT TxCmdError IO ()
+runLegacyTransactionViewCmd :: ViewOutputFormat -> Maybe (File () Out) -> InputTxBodyOrTxFile -> ExceptT TxCmdError IO ()
 runLegacyTransactionViewCmd
     yamlOrJson
     mOutFile

cardano-cli/src/Cardano/CLI/Parser.hs

@@ -3,15 +3,16 @@
 module Cardano.CLI.Parser
   ( readerFromAttoParser
   , readFractionAsRational
+  , readGovernanceActionViewOutputFormat
   , readKeyOutputFormat
   , readIdOutputFormat
   , readTxViewOutputFormat
   , readRational
   , readRationalUnitInterval
   , readStringOfMaxLength
+  , readViewOutputFormat
   , readURIOfMaxLength
   , eDNSName
-  , readGovernanceActionViewOutputFormat
   ) where
 
 import           Cardano.CLI.Types.Common
@@ -51,30 +52,24 @@ readKeyOutputFormat = do
         , ". Accepted output formats are \"text-envelope\" and \"bech32\"."
         ]
 
-readTxViewOutputFormat :: Opt.ReadM TxViewOutputFormat
-readTxViewOutputFormat = do
-  s <- Opt.str @String
-  case s of
-    "json" -> pure TxViewOutputFormatJson
-    "yaml" -> pure TxViewOutputFormatYaml
-    _ ->
-      fail $ mconcat
-        [ "Invalid transaction view output format: " <> show s
-        , ". Accepted output formats are \"json\" and \"yaml\"."
-        ]
+readTxViewOutputFormat :: Opt.ReadM ViewOutputFormat
+readTxViewOutputFormat = readViewOutputFormat "transaction"
 
-readGovernanceActionViewOutputFormat :: Opt.ReadM GovernanceActionViewOutputFormat
-readGovernanceActionViewOutputFormat = do
+readViewOutputFormat :: String -> Opt.ReadM ViewOutputFormat
+readViewOutputFormat kind = do
   s <- Opt.str @String
   case s of
-    "json" -> pure GovernanceActionViewOutputFormatJson
-    "yaml" -> pure GovernanceActionViewOutputFormatYaml
+    "json" -> pure ViewOutputFormatJson
+    "yaml" -> pure ViewOutputFormatYaml
     _ ->
       fail $ mconcat
-        [ "Invalid governance action view output format: " <> show s
+        [ "Invalid ", kind, " output format: " <> show s
         , ". Accepted output formats are \"json\" and \"yaml\"."
         ]
 
+readGovernanceActionViewOutputFormat :: Opt.ReadM ViewOutputFormat
+readGovernanceActionViewOutputFormat = readViewOutputFormat "governance action view"
+
 readURIOfMaxLength :: Int -> Opt.ReadM Text
 readURIOfMaxLength maxLen =
   Text.pack <$> readStringOfMaxLength maxLen

cardano-cli/src/Cardano/CLI/Types/Common.hs

@@ -25,7 +25,6 @@ module Cardano.CLI.Types.Common
   , GenesisDir(..)
   , GenesisFile (..)
   , GenesisKeyFile(..)
-  , GovernanceActionViewOutputFormat(..)
   , InputTxBodyOrTxFile (..)
   , KeyOutputFormat(..)
   , MetadataFile(..)
@@ -70,10 +69,10 @@ module Cardano.CLI.Types.Common
   , TxOutCount(..)
   , TxOutDatumAnyEra (..)
   , TxShelleyWitnessCount(..)
-  , TxViewOutputFormat(..)
   , UpdateProposalFile (..)
   , VerificationKeyBase64(..)
   , VerificationKeyFile
+  , ViewOutputFormat(..)
   , VoteUrl(..)
   , VoteText(..)
   , VoteHashSource(..)
@@ -459,14 +458,9 @@ data TxMempoolQuery =
     | TxMempoolQueryInfo
   deriving Show
 
-data TxViewOutputFormat
-  = TxViewOutputFormatJson
-  | TxViewOutputFormatYaml
-  deriving Show
-
-data GovernanceActionViewOutputFormat
-  = GovernanceActionViewOutputFormatJson
-  | GovernanceActionViewOutputFormatYaml
+data ViewOutputFormat
+  = ViewOutputFormatJson
+  | ViewOutputFormatYaml
   deriving Show
 --
 -- Shelley CLI flag/option data types

cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs

@@ -116,7 +116,7 @@ hprop_golden_conway_governance_action_view_update_committee_yaml =
     actionView <- execCardanoCLI
       [ "conway", "governance", "action", "view"
       , "--action-file", actionFile
-      , "--output-format", "yaml"
+      , "--output-yaml"
       ]
     H.diffVsGoldenFile actionView goldenActionViewFile
 

cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Vote.hs

@@ -63,7 +63,7 @@ hprop_golden_governance_governance_vote_view_yaml =
     voteViewGold <- H.note "test/cardano-cli-golden/files/golden/governance/vote/voteViewYAML"
     voteView <- execCardanoCLI
       [ "conway", "governance", "vote", "view"
-      , "--yaml"
+      , "--output-yaml"
       , "--vote-file", voteFile
       ]
 

cardano-cli/test/cardano-cli-golden/Test/Golden/TxView.hs

@@ -40,7 +40,7 @@ _hprop_golden_view_byron_yaml =
     -- View transaction body
     result <-
       execCardanoCLI
-        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-format", "yaml"]
+        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-yaml"]
     H.diffVsGoldenFile result "test/cardano-cli-golden/files/golden/byron/transaction-view.out"
 
 -- TODO: Expose command to view byron tx files
@@ -147,7 +147,7 @@ hprop_golden_view_shelley_yaml = let
     -- View transaction body
     result <-
       execCardanoCLI
-        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-format", "yaml"]
+        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-yaml"]
 
     H.diffVsGoldenFile result "test/cardano-cli-golden/files/golden/shelley/transaction-view.out"
 
@@ -178,7 +178,7 @@ hprop_golden_view_allegra_yaml =
     -- View transaction body
     result <-
       execCardanoCLI
-        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-format", "yaml"]
+        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-yaml"]
     H.diffVsGoldenFile result "test/cardano-cli-golden/files/golden/allegra/transaction-view.out"
 
 hprop_golden_view_mary_yaml :: Property
@@ -245,7 +245,7 @@ hprop_golden_view_mary_yaml =
     -- View transaction body
     result <-
       execCardanoCLI
-        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-format", "yaml"]
+        ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-yaml"]
     H.diffVsGoldenFile result "test/cardano-cli-golden/files/golden/mary/transaction-view.out"
 
 createAlonzoTxBody :: Maybe FilePath -> FilePath -> Integration ()
@@ -302,7 +302,7 @@ hprop_golden_view_alonzo_yaml =
       -- View transaction body
       result <-
         execCardanoCLI
-          ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-format", "yaml"]
+          ["transaction", "view", "--tx-body-file", transactionBodyFile, "--output-yaml"]
       H.diffVsGoldenFile result "test/cardano-cli-golden/files/golden/alonzo/transaction-view.out"
 
 hprop_golden_view_alonzo_signed_yaml :: Property
@@ -328,6 +328,6 @@ hprop_golden_view_alonzo_signed_yaml =
     -- View transaction body
     result <-
       execCardanoCLI
-        ["transaction", "view", "--tx-file", transactionFile, "--output-format", "yaml"]
+        ["transaction", "view", "--tx-file", transactionFile, "--output-yaml"]
 
     H.diffVsGoldenFile result (golden </> "signed-transaction-view.out")