Merge pull request #277 from Concordium/show-all-options

Show the format flag when importing an account
Concordium · Sep 19, 2023 · 650e6c3 · 650e6c3
2 parents fd3b287 + b053bcd
commit 650e6c3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 29 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -11,7 +11,9 @@
   - `GetBakerEarliestWinTime`
   - `GetWinningBakersEpoch`
   - `GetFirstBlockEpoch`
-- Add support for `CommissionRates` in `CurrentPaydayBakerPoolStatus` (Only available for node versions > 6.0).
+  - Add support for `CommissionRates` in `CurrentPaydayBakerPoolStatus` (Only available for node versions > 6.0).
+  - Show all options for importing an account.
+
 
 ## 6.0.1
 

diff --git a/app/Main.hs b/app/Main.hs
@@ -2,9 +2,7 @@ module Main where
 
 import Concordium.Client.Commands
 import Concordium.Client.Runner
-import Data.Maybe
 import Options.Applicative
-import System.Environment
 import System.IO
 
 ccPrefs :: ParserPrefs
@@ -29,5 +27,4 @@ setReplacement h = do
 main :: IO ()
 main = do
     mapM_ setReplacement [stdout, stderr]
-    showAllOpts <- lookupEnv "SHOW_ALL_OPTS"
-    process =<< customExecParser ccPrefs (optsParser $ isJust showAllOpts)
+    process =<< customExecParser ccPrefs optsParser
diff --git a/src/Concordium/Client/Commands.hs b/src/Concordium/Client/Commands.hs
@@ -546,11 +546,6 @@ data IdentityShowCmd
         {isarsBlockHash :: !(Maybe Text)}
     deriving (Show)
 
-type ShowAllOpts = Bool
-
-internalUnless :: ShowAllOpts -> Mod f a
-internalUnless showAllOpts = if showAllOpts then idm else internal
-
 visibleHelper :: Parser (a -> a)
 visibleHelper =
     abortOption (ShowHelpText Nothing) $
@@ -560,10 +555,10 @@ visibleHelper =
               help "Show detailed help text."
             ]
 
-optsParser :: ShowAllOpts -> ParserInfo Options
-optsParser showAllOpts =
+optsParser :: ParserInfo Options
+optsParser =
     info
-        (programOptions showAllOpts <**> versionOption <**> visibleHelper)
+        (programOptions <**> versionOption <**> visibleHelper)
         ( fullDesc
             <> progDesc "Concordium Client CLI."
             <> header "concordium-client - a client to interact with the concordium network."
@@ -660,16 +655,16 @@ interactionOptsParser =
         <$> (not <$> switch (long "no-confirm" <> help "Do not ask for confirmation before proceeding to send the transaction."))
         <*> (not <$> switch (long "no-wait" <> help "Exit right after sending the transaction without waiting for it to be committed and finalized."))
 
-programOptions :: ShowAllOpts -> Parser Options
-programOptions showAllOpts =
+programOptions :: Parser Options
+programOptions =
     Options
         <$> hsubparser
             ( metavar "command"
                 <> transactionCmds
                 <> accountCmds
                 <> moduleCmds
                 <> contractCmds
-                <> configCmds showAllOpts
+                <> configCmds
                 <> consensusCmds
                 <> blockCmds
                 <> bakerCmds
@@ -1297,8 +1292,8 @@ contractRemoveNameCmd =
             )
         )
 
-configCmds :: ShowAllOpts -> Mod CommandFields Cmd
-configCmds showAllOpts =
+configCmds :: Mod CommandFields Cmd
+configCmds =
     command
         "config"
         ( info
@@ -1308,7 +1303,7 @@ configCmds showAllOpts =
                         <> configShowCmd
                         <> configBackupExportCmd
                         <> configBackupImportCmd
-                        <> configAccountCmds showAllOpts
+                        <> configAccountCmds
                     )
             )
             (progDesc "Commands for inspecting and changing local configuration.")
@@ -1355,16 +1350,16 @@ configBackupImportCmd =
             (progDesc "Import config backup file, requires password if encrypted")
         )
 
-configAccountCmds :: ShowAllOpts -> Mod CommandFields ConfigCmd
-configAccountCmds showAllOpts =
+configAccountCmds :: Mod CommandFields ConfigCmd
+configAccountCmds =
     command
         "account"
         ( info
             ( ConfigAccountCmd
                 <$> hsubparser
                     ( configAccountNameCmd
                         <> configAccountRemove
-                        <> configAccountImportCmd showAllOpts
+                        <> configAccountImportCmd
                         <> configAccountAddKeysCmd
                         <> configAccountUpdateKeysCmd
                         <> configAccountChangeKeyPasswordCmd
@@ -1398,24 +1393,21 @@ configAccountRemove =
             (progDesc "Remove the account from the persistent config.")
         )
 
-configAccountImportCmd :: ShowAllOpts -> Mod CommandFields ConfigAccountCmd
-configAccountImportCmd showAllOpts =
+configAccountImportCmd :: Mod CommandFields ConfigAccountCmd
+configAccountImportCmd =
     command
         "import"
         ( info
             ( ConfigAccountImport
                 <$> strArgument (metavar "FILE" <> help "File with one or more accounts exported from the wallet.")
                 <*> optional (strOption (long "name" <> metavar "NAME" <> help nameOptionHelp))
-                <*> option readAccountExportFormat (internalUnless showAllOpts <> long "format" <> metavar "FORMAT" <> value FormatMobile <> help "Export format. Supported values are 'mobile' and 'genesis' (default: 'mobile').")
+                <*> option readAccountExportFormat (long "format" <> metavar "FORMAT" <> value FormatMobile <> help "Export format. Supported values are 'mobile' and 'genesis' (default: 'mobile').")
                 <*> switch (long "skip-existing" <> short 's' <> help "Automatically skip importing accounts when the keydirectory already exists")
             )
             (progDesc "Import an account to persistent config.")
         )
   where
-    nameOptionHelp =
-        if showAllOpts
-            then "Name of the account. For the 'genesis' format, this sets the name to assign to the account. For the 'mobile' format (which contains multiple already named accounts), it selects which account to import."
-            else "Name of a single account in the wallet. This will cause the client to only import that account."
+    nameOptionHelp = "Name of the account. For the 'genesis' format, this sets the name to assign to the account. For the 'mobile' format (which contains multiple already named accounts), it selects which account to import."
 
 configAccountAddKeysCmd :: Mod CommandFields ConfigAccountCmd
 configAccountAddKeysCmd =