wIP

IntersectMBO · Sep 19, 2024 · 75fc255 · 75fc255
1 parent 31dcc96
commit 75fc255
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands.hs
@@ -109,9 +109,7 @@ pAnyEraCommand envCli =
           Opt.progDesc "Conway era commands"
     , subParser "latest" $
         Opt.info (AnyEraCommandOf ShelleyBasedEraConway <$> pCmds ShelleyBasedEraConway envCli) $
-          Opt.progDesc ("Latest era commands (Babbage)" <> deprecationText)
-    , -- Default to Conway era
-      AnyEraCommandOf ShelleyBasedEraConway <$> pCmds ShelleyBasedEraConway envCli
+          Opt.progDesc ("Latest era commands (Conway)" <> deprecationText)
     ]
 
 pCmds :: ShelleyBasedEra era -> EnvCli -> Parser (Cmds era)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -362,6 +362,10 @@ subParser :: String -> ParserInfo a -> Parser a
 subParser availableCommand pInfo =
   Opt.hsubparser $ Opt.command availableCommand pInfo <> Opt.metavar availableCommand
 
+subParserWithDefault :: a -> String -> ParserInfo a -> Parser a
+subParserWithDefault def availableCommand pInfo =
+  subParser availableCommand pInfo <|> pure def
+
 subInfoParser :: String -> InfoMod a -> [Maybe (Parser a)] -> Maybe (Parser a)
 subInfoParser name i mps = case catMaybes mps of
   [] -> Nothing

diff --git a/cardano-cli/src/Cardano/CLI/Options.hs b/cardano-cli/src/Cardano/CLI/Options.hs
@@ -9,6 +9,8 @@ module Cardano.CLI.Options
   )
 where
 
+import           Cardano.Api (ShelleyBasedEra (..))
+
 import           Cardano.CLI.Byron.Parsers (backwardsCompatibilityCommands, parseByronCommands)
 import           Cardano.CLI.Environment (EnvCli)
 import           Cardano.CLI.EraBased.Commands
@@ -62,6 +64,10 @@ parseClientCommand envCli =
     , backwardsCompatibilityCommands envCli
     , parseDisplayVersion (opts envCli)
     ]
+    <|> defaultParser envCli
+
+defaultParser :: EnvCli -> Parser ClientCommand
+defaultParser envCli = fmap (AnyEraCommand . AnyEraCommandOf ShelleyBasedEraConway) (pCmds ShelleyBasedEraConway envCli)
 
 parseByron :: EnvCli -> Parser ClientCommand
 parseByron mNetworkId =