[RSC-151] Rename flag and add to other entities

Author: gromakovsky

src/Bank/BankOptions.hs

@@ -29,13 +29,14 @@ data Command
     | RemoveExplorer String Int
 
 data Options = Options
-    { cloCommand       :: Command
-    , cloPath          :: FilePath
-    , cloPeriodDelta   :: Integer
-    , cloLogSeverity   :: Severity
-    , cloSkPath        :: FilePath
-    , cloAutoCreateKey :: Bool
-    , cloConfigPath    :: FilePath
+    { cloCommand        :: Command
+    , cloPath           :: FilePath
+    , cloPeriodDelta    :: Integer
+    , cloLogSeverity    :: Severity
+    , cloSkPath         :: FilePath
+    , cloAutoCreateKey  :: Bool
+    , cloConfigPath     :: FilePath
+    , cloDefaultContext :: Bool      -- ^ Use defaultNodeContext
     }
 
 commandParser :: Parser Command
@@ -123,7 +124,14 @@ optionsParser defaultSKPath configDir defaultConfigPath =
         (long "config-path" <> help "Path to configuration file" <>
          value defaultConfigPath <>
          showDefault <>
-         metavar "FILEPATH")
+         metavar "FILEPATH") <*>
+    switch
+        (mconcat
+             [ short 'd'
+             , long "default-context"
+             , help
+                   ("Use default NodeContext. " <>
+                    "Intended to be used for local deployment")])
 
 getOptions :: IO Options
 getOptions = do

src/Bank/Main.hs

@@ -34,7 +34,10 @@ main = do
                   return sk
             Left err -> throwM err
             Right sk -> return sk
-    let ca = B.CACustomLocation cloConfigPath
+    let ca =
+            if cloDefaultContext
+                then B.CADefault
+                else B.CACustomLocation cloConfigPath
     case cloCommand of
         Opts.AddMintette host port pk -> do
             let m = Mintette host port

src/Deploy/Main.hs

@@ -171,7 +171,9 @@ setupBankUser CommonParams{..} = do
     Cherepakha.echo
         "Use command below to do smth as bank user"
     Cherepakha.echo $
-        sformat ("stack $NIX_STACK exec -- rscoin-user --local " % stext) walletPathArg
+        sformat
+            ("stack $NIX_STACK exec -- rscoin-user --default-context " % stext)
+            walletPathArg
 
 mintettePort :: Integral a => a -> Int
 mintettePort = (C.defaultPort + 1 +) . fromIntegral

src/Explorer/ExplorerOptions.hs

@@ -7,8 +7,8 @@ module ExplorerOptions
 
 import           Options.Applicative    (Parser, auto, execParser, fullDesc,
                                          help, helper, info, long, metavar,
-                                         option, progDesc, showDefault, switch,
-                                         value, (<>))
+                                         option, progDesc, short, showDefault,
+                                         switch, value, (<>))
 import           System.FilePath        ((</>))
 
 import           Serokell.Util.OptParse (strOption)
@@ -18,13 +18,14 @@ import           RSCoin.Core            (Severity (Error), configDirectory,
                                          defaultSecretKeyPath)
 
 data Options = Options
-    { cloPortRpc       :: Int
-    , cloPortWeb       :: Int
-    , cloPath          :: FilePath
-    , cloSecretKeyPath :: FilePath
-    , cloAutoCreateKey :: Bool
-    , cloLogSeverity   :: Severity
-    , cloConfigPath    :: FilePath
+    { cloPortRpc        :: Int
+    , cloPortWeb        :: Int
+    , cloPath           :: FilePath
+    , cloSecretKeyPath  :: FilePath
+    , cloAutoCreateKey  :: Bool
+    , cloLogSeverity    :: Severity
+    , cloConfigPath     :: FilePath
+    , cloDefaultContext :: Bool
     }
 
 optionsParser :: FilePath -> FilePath -> FilePath -> Parser Options
@@ -77,7 +78,14 @@ optionsParser defaultSKPath configDir defaultConfigPath =
              [ long "config-path"
              , help "Path to configuration file"
              , value defaultConfigPath
-             , showDefault])
+             , showDefault]) <*>
+    switch
+        (mconcat
+             [ short 'd'
+             , long "default-context"
+             , help
+                   ("Use default NodeContext. " <>
+                    "Intended to be used for local deployment")])
 
 
 getOptions :: IO Options

src/Explorer/Main.hs

@@ -16,23 +16,24 @@ main = do
     Options{..} <- getOptions
     C.initLogging cloLogSeverity
     skEither <- try $ readSecretKey cloSecretKeyPath
-    sk <- case skEither of
-        Left (_::SomeException) | cloAutoCreateKey -> do
-            putStrLn $ "Generating and putting secret keys into: " ++
-                       cloSecretKeyPath
-            let fpSecret = cloSecretKeyPath
-            let fpPublic = cloSecretKeyPath <> ".pub"
-            (sk,pk) <- keyGen
-            writePublicKey fpPublic pk
-            writeSecretKey fpSecret sk
-            putStrLn "Wrote a keypar on the disk"
-            return sk
-        Left err -> throwM err
-        Right sk -> return sk
-    E.launchExplorerReal
-        cloPortRpc
-        cloPortWeb
-        cloLogSeverity
-        cloPath
-        (E.CACustomLocation cloConfigPath)
-        sk
+    sk <-
+        case skEither of
+            Left (_ :: SomeException)
+              | cloAutoCreateKey -> do
+                  putStrLn $
+                      "Generating and putting secret keys into: " ++
+                      cloSecretKeyPath
+                  let fpSecret = cloSecretKeyPath
+                  let fpPublic = cloSecretKeyPath <> ".pub"
+                  (sk,pk) <- keyGen
+                  writePublicKey fpPublic pk
+                  writeSecretKey fpSecret sk
+                  putStrLn "Wrote a keypar on the disk"
+                  return sk
+            Left err -> throwM err
+            Right sk -> return sk
+    let ctxArg =
+            if cloDefaultContext
+                then E.CADefault
+                else E.CACustomLocation cloConfigPath
+    E.launchExplorerReal cloPortRpc cloPortWeb cloLogSeverity cloPath ctxArg sk

src/Mintette/Main.hs

@@ -36,6 +36,9 @@ main = do
             if cloMemMode
                 then Nothing
                 else Just cloPath
-        ctxArg = M.CACustomLocation cloConfigPath
+        ctxArg =
+            if cloDefaultContext
+                then M.CADefault
+                else M.CACustomLocation cloConfigPath
         epochDelta = fromInteger cloEpochDelta :: Second
     M.launchMintetteReal epochDelta cloPort sk dbPath ctxArg

src/Mintette/MintetteOptions.hs

@@ -19,14 +19,15 @@ import           RSCoin.Core            (Severity (Error), configDirectory,
                                          defaultSecretKeyPath)
 
 data Options = Options
-    { cloPort          :: Int
-    , cloPath          :: FilePath
-    , cloEpochDelta    :: Integer
-    , cloSecretKeyPath :: FilePath
-    , cloAutoCreateKey :: Bool
-    , cloLogSeverity   :: Severity
-    , cloMemMode       :: Bool
-    , cloConfigPath    :: FilePath
+    { cloPort           :: Int
+    , cloPath           :: FilePath
+    , cloEpochDelta     :: Integer
+    , cloSecretKeyPath  :: FilePath
+    , cloAutoCreateKey  :: Bool
+    , cloLogSeverity    :: Severity
+    , cloMemMode        :: Bool
+    , cloConfigPath     :: FilePath
+    , cloDefaultContext :: Bool
     }
 
 optionsParser :: FilePath -> FilePath -> FilePath -> Parser Options
@@ -63,7 +64,14 @@ optionsParser defaultSKPath configDir defaultConfigPath =
         (long "config-path" <> help "Path to configuration file" <>
          value defaultConfigPath <>
          showDefault <>
-         metavar "FILEPATH")
+         metavar "FILEPATH") <*>
+    switch
+        (mconcat
+             [ short 'd'
+             , long "default-context"
+             , help
+                   ("Use default NodeContext. " <>
+                    "Intended to be used for local deployment")])
 
 getOptions :: IO Options
 getOptions = do

src/Notary/Main.hs

@@ -12,16 +12,15 @@ main :: IO ()
 main = do
     Opts.Options{..} <- Opts.getOptions
     initLogging cliLogSeverity
-    let dbPath = if cliMemMode
-                 then Nothing
-                 else Just cliPath
+    let dbPath =
+            if cliMemMode
+                then Nothing
+                else Just cliPath
     let trustedKeys = mapMaybe constructPublicKey cliTrustedKeys
+    let ctxArg =
+            if cloDefaultContext
+                then N.CADefault
+                else N.CACustomLocation cliConfigPath
     when (length trustedKeys < length cliTrustedKeys) $
         logWarning "Not all keys were parsed!"
-
-    N.launchNotaryReal
-        cliLogSeverity
-        dbPath
-        (N.CACustomLocation cliConfigPath)
-        cliWebPort
-        trustedKeys
+    N.launchNotaryReal cliLogSeverity dbPath ctxArg cliWebPort trustedKeys

src/Notary/NotaryOptions.hs

@@ -6,10 +6,10 @@ module NotaryOptions
         ) where
 
 import           Data.Text              (Text)
-import           Options.Applicative    (Parser, auto, execParser, fullDesc, many,
-                                         help, helper, info, long, metavar,
-                                         option, progDesc, short, showDefault,
-                                         switch, value, (<>))
+import           Options.Applicative    (Parser, auto, execParser, fullDesc,
+                                         help, helper, info, long, many,
+                                         metavar, option, progDesc, short,
+                                         showDefault, switch, value, (<>))
 import           System.FilePath        ((</>))
 
 import           Serokell.Util.OptParse (strOption)
@@ -18,12 +18,13 @@ import           RSCoin.Core            (Severity (Error), configDirectory,
                                          defaultConfigurationPath)
 
 data Options = Options
-    { cliPath        :: FilePath
-    , cliLogSeverity :: Severity
-    , cliMemMode     :: Bool
-    , cliWebPort     :: Int
-    , cliConfigPath  :: FilePath
-    , cliTrustedKeys :: [Text]
+    { cliPath           :: FilePath
+    , cliLogSeverity    :: Severity
+    , cliMemMode        :: Bool
+    , cliWebPort        :: Int
+    , cliConfigPath     :: FilePath
+    , cliTrustedKeys    :: [Text]
+    , cloDefaultContext :: Bool
     } deriving Show
 
 optionsParser :: FilePath -> FilePath -> Parser Options
@@ -48,9 +49,19 @@ optionsParser configDir defaultConfigPath =
          value defaultConfigPath <>
          showDefault <>
          metavar "FILEPATH") <*>
-    many (strOption $ long "trust-keys" <> metavar "[PUBLIC KEY]" <>
-          help "Public keys notary will trust as master keys. If not specifed \
-               \then notary will trust any key")
+    many
+        (strOption $
+         long "trust-keys" <> metavar "[PUBLIC KEY]" <>
+         help
+             "Public keys notary will trust as master keys. If not specifed \
+               \then notary will trust any key") <*>
+    switch
+        (mconcat
+             [ short 'd'
+             , long "default-context"
+             , help
+                   ("Use default NodeContext. " <>
+                    "Intended to be used for local deployment")])
 
 getOptions :: IO Options
 getOptions = do

src/User/Main.hs

@@ -19,7 +19,7 @@ main = do
     opts@O.UserOptions{..} <- O.getUserOptions
     C.initLogging logSeverity
     let ctxArg =
-            if localDeploy
+            if defaultContext
                 then CADefault
                 else CACustomLocation configPath
     runRealModeUntrusted C.userLoggerName ctxArg $

src/User/UserOptions.hs

@@ -98,17 +98,17 @@ data DumpCommand
 
 -- | Datatype describing user command line options
 data UserOptions = UserOptions
-    { userCommand  :: UserCommand -- ^ Command for the program to process
-    , isBankMode   :: Bool        -- ^ If creating wallet in bank-mode,
-    , bankModePath :: FilePath    -- ^ Path to bank's secret key
-    , addressesNum :: Int         -- ^ Number of addresses to create initially
+    { userCommand    :: UserCommand  -- ^ Command for the program to process
+    , isBankMode     :: Bool         -- ^ If creating wallet in bank-mode,
+    , bankModePath   :: FilePath     -- ^ Path to bank's secret key
+    , addressesNum   :: Int          -- ^ Number of addresses to create initially
 #if GtkGui
-    , guidbPath    :: FilePath    -- ^ Path to the gui database.
+    , guidbPath      :: FilePath     -- ^ Path to the gui database.
 #endif
-    , walletPath   :: FilePath    -- ^ Path to the wallet
-    , logSeverity  :: Severity    -- ^ Logging severity
-    , configPath   :: FilePath    -- ^ Configuration file path
-    , localDeploy  :: Bool    -- ^ Use defaultNodeContext
+    , walletPath     :: FilePath     -- ^ Path to the wallet
+    , logSeverity    :: Severity     -- ^ Logging severity
+    , configPath     :: FilePath     -- ^ Configuration file path
+    , defaultContext :: Bool         -- ^ Use defaultNodeContext
     } deriving (Show)
 
 userCommandParser :: Parser UserCommand
@@ -410,7 +410,8 @@ userOptionsParser dskp configDir defaultConfigPath =
          value defaultConfigPath <>
          showDefault <>
          metavar "FILEPATH") <*>
-    switch (mconcat [long "local",
+    switch (mconcat [short 'd',
+                     long "default-context",
                      help ("Use default NodeContext. "
                            <> "Intended to be used for local deployment")
                     ])