Rebase changes

Review changes

Author: Jimbo4350

cardano-cli/cardano-cli.cabal

@@ -143,12 +143,12 @@ library
     Cardano.CLI.EraIndependent.Address.Option
     Cardano.CLI.EraIndependent.Address.Run
     Cardano.CLI.EraIndependent.Cip.Cip129.Command
-    Cardano.CLI.EraIndependent.Cip.Cip129.Conversion
-    Cardano.CLI.EraIndependent.Cip.Cip129.Options
+    Cardano.CLI.EraIndependent.Cip.Cip129.Internal.Conversion
+    Cardano.CLI.EraIndependent.Cip.Cip129.Option
     Cardano.CLI.EraIndependent.Cip.Cip129.Run
     Cardano.CLI.EraIndependent.Cip.Command
     Cardano.CLI.EraIndependent.Cip.Common
-    Cardano.CLI.EraIndependent.Cip.Options
+    Cardano.CLI.EraIndependent.Cip.Option
     Cardano.CLI.EraIndependent.Cip.Run
     Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Command
     Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Run

cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Command.hs

@@ -25,7 +25,6 @@ import Cardano.CLI.Type.Key
 
 import Data.Text (Text)
 import Vary
-import Vary (Vary)
 
 data GovernanceDRepCmds era
   = GovernanceDRepKeyGenCmd !(GovernanceDRepKeyGenCmdArgs era)

cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Option.hs

@@ -23,7 +23,6 @@ import Data.Foldable (asum)
 import Data.Function
 import Options.Applicative (Parser)
 import Options.Applicative qualified as Opt
-import Vary
 
 pGovernanceDRepCmds
   :: ()
@@ -85,22 +84,6 @@ pGovernanceDRepKeyIdCmd era = do
       )
     $ Opt.progDesc "Generate a drep id."
 
-pDRepIdOutputFormat :: Parser (Vary [FormatBech32, FormatHex])
-pDRepIdOutputFormat =
-  asum [make (Vary.from FormatHex) "hex", make (Vary.from FormatBech32) "bech32"]
-    <|> pure default_
- where
-  default_ = Vary.from FormatBech32
-  make format flag_ =
-    Opt.flag' format $
-      mconcat
-        [ Opt.help $
-            "Format drep id output as "
-              <> flag_
-              <> (if format == default_ then " (the default)." else ".")
-        , Opt.long ("output-" <> flag_)
-        ]
-
 -- Registration Certificate related
 
 pRegistrationCertificateCmd

cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Conversion.hs renamed to cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Internal/Conversion.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 
-module Cardano.CLI.EraIndependent.Cip.Cip129.Conversion
+module Cardano.CLI.EraIndependent.Cip.Cip129.Internal.Conversion
   ( encodeCip129DrepVerficationKeyText
   , encodeCip129CommitteeColdVerficationKeyText
   , encodeCip129CommitteeHotVerficationKeyText

cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Options.hs renamed to cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Option.hs

@@ -1,4 +1,4 @@
-module Cardano.CLI.EraIndependent.Cip.Cip129.Options
+module Cardano.CLI.EraIndependent.Cip.Cip129.Option
   ( pCip129
   )
 where

cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Run.hs

@@ -9,7 +9,7 @@ import Cardano.Api hiding (Cip129)
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraIndependent.Cip.Cip129.Command
-import Cardano.CLI.EraIndependent.Cip.Cip129.Conversion
+import Cardano.CLI.EraIndependent.Cip.Cip129.Internal.Conversion
 import Cardano.CLI.EraIndependent.Cip.Common
 import Cardano.CLI.Orphan ()
 import Cardano.CLI.Read

cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Options.hs renamed to cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Option.hs

@@ -1,10 +1,10 @@
-module Cardano.CLI.EraIndependent.Cip.Options
+module Cardano.CLI.EraIndependent.Cip.Option
   ( parseCipCmd
   )
 where
 
 import Cardano.CLI.Command (ClientCommand (CipFormatCmds))
-import Cardano.CLI.EraIndependent.Cip.Cip129.Options
+import Cardano.CLI.EraIndependent.Cip.Cip129.Option
 import Cardano.CLI.EraIndependent.Cip.Command
 import Cardano.CLI.Parser
 
@@ -27,6 +27,6 @@ pCipFormat =
       Opt.info pCip129 $
         Opt.progDesc $
           mconcat
-            [ "Modified binary encoding of drep keys, constitutional committee cold and hot keys, governance actions."
+            [ "Modified binary encoding of drep keys, constitutional committee cold and hot keys, governance actions. "
             , "https://github.com/cardano-foundation/CIPs/tree/master/CIP-0129"
             ]

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

@@ -16,7 +16,7 @@ import Cardano.CLI.EraBased.Common.Option
 import Cardano.CLI.EraBased.Option
 import Cardano.CLI.EraBased.Query.Option (pQueryCmdsTopLevel)
 import Cardano.CLI.EraIndependent.Address.Option
-import Cardano.CLI.EraIndependent.Cip.Options
+import Cardano.CLI.EraIndependent.Cip.Option
 import Cardano.CLI.EraIndependent.Debug.Option
 import Cardano.CLI.EraIndependent.Hash.Option
 import Cardano.CLI.EraIndependent.Key.Option

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

@@ -27,10 +27,10 @@ instance ToJSON L.DefaultVote where
       L.DefaultNoConfidence -> String "DefaultNoConfidence"
 
 instance Error [Bech32DecodeError] where
-  prettyError errs = mconcat $ map prettyError errs
+  prettyError errs = vsep $ map prettyError errs
 
 instance Error [RawBytesHexError] where
-  prettyError errs = mconcat $ map prettyError errs
+  prettyError errs = vsep $ map prettyError errs
 
 instance Error Text.ParseError where
   prettyError = pretty . show