[GH-233] Add NTP, Update, SSC, TXP, DLG specific configuration options using CLI (#237)

* [GH-235] Fixing nested configuration problems.

* [GH-235] Fixing review suggestions, cleaner solution.

* [GH-233] Add NTP, Update, SSC, TXP, DLG specific configuration options using CLI.

Author: ksaric

app/Main.hs

@@ -11,12 +11,8 @@ import           Cardano.Shell.Features.Logging (LoggingCLIArguments,
 import           Cardano.Shell.Features.Networking (createNetworkingFeature)
 
 import           Cardano.Shell.Configuration.Lib (finaliseCardanoConfiguration)
-import           Cardano.Shell.Constants.CLI (configBlockCLIParser,
-                                              configCoreCLIParser,
-                                              configWalletCLIParser)
-import           Cardano.Shell.Constants.PartialTypes (PartialBlock (..), PartialCardanoConfiguration (..),
-                                                       PartialCore (..),
-                                                       PartialWallet (..))
+import           Cardano.Shell.Constants.CLI (configCardanoConfigurationCLIParser)
+import           Cardano.Shell.Constants.PartialTypes (PartialCardanoConfiguration (..))
 import           Cardano.Shell.Lib
 import           Cardano.Shell.Presets (mainnetConfiguration)
 import           Cardano.Shell.Types
@@ -26,11 +22,7 @@ import           Options.Applicative
 
 -- | The product type of all command line arguments.
 -- All here being - from all the features.
-data CLIArguments = CLIArguments
-                        !LoggingCLIArguments
-                        !PartialWallet
-                        !PartialBlock
-                        !PartialCore
+data CLIArguments = CLIArguments !LoggingCLIArguments !PartialCardanoConfiguration
 
 main :: IO ()
 main = do
@@ -94,49 +86,23 @@ initializeAllFeatures :: PartialCardanoConfiguration -> CardanoEnvironment -> IO
 initializeAllFeatures partialConfig cardanoEnvironment = do
 
     -- Here we parse the __CLI__ arguments for the actual application.
-    CLIArguments loggingCLIArguments walletCLI blockCLI coreCLI  <- execParser parserWithInfo
+    CLIArguments loggingCLIArguments cardanoConfigurationCLI  <- execParser parserWithInfo
 
-    let configCore      = pccCore partialConfig
-    let configBlock     = pccBlock partialConfig
-    let configWallet    = pccWallet partialConfig
-
-    let pccCore'        = configCore    <> coreCLI
-    let pccBlock'       = configBlock   <> blockCLI
-    let pccWallet'      = configWallet  <> walletCLI
-
-    putTextLn "************************************************"
-    putTextLn "CORE"
-    putTextLn "************************************************"
-    putTextLn $ show configCore
-    putTextLn "------------------------------------------------"
-    putTextLn $ show coreCLI
-    putTextLn "------------------------------------------------"
-    putTextLn $ show pccCore'
+    let cardanoConfiguration'   = partialConfig <> cardanoConfigurationCLI
 
     putTextLn "************************************************"
-    putTextLn "BLOCK"
+    putTextLn "Cardano configurationn"
     putTextLn "************************************************"
-    putTextLn $ show configBlock
-    putTextLn "------------------------------------------------"
-    putTextLn $ show blockCLI
+    putTextLn $ show partialConfig
     putTextLn "------------------------------------------------"
-    putTextLn $ show pccBlock'
-
-    putTextLn "************************************************"
-    putTextLn "WALLET"
-    putTextLn "************************************************"
-    putTextLn $ show configWallet
+    putTextLn $ show cardanoConfigurationCLI
     putTextLn "------------------------------------------------"
-    putTextLn $ show walletCLI
+    putTextLn $ show cardanoConfiguration'
     putTextLn "------------------------------------------------"
-    putTextLn $ show pccWallet'
 
+    -- Finalize the configuration and if something is missing, just throw error.
     finalConfig <- either (throwIO . ConfigurationError) pure $
-          finaliseCardanoConfiguration $ partialConfig
-              { pccCore     = pccCore'
-              , pccBlock    = pccBlock'
-              , pccWallet   = pccWallet'
-              }
+          finaliseCardanoConfiguration cardanoConfiguration'
 
     -- Here we initialize all the features
     (loggingLayer, loggingFeature)  <- createLoggingFeature cardanoEnvironment finalConfig loggingCLIArguments
@@ -164,7 +130,5 @@ initializeAllFeatures partialConfig cardanoEnvironment = do
     commandLineParser :: Parser CLIArguments
     commandLineParser = CLIArguments
         <$> loggingParser
-        <*> configWalletCLIParser
-        <*> configBlockCLIParser
-        <*> configCoreCLIParser
+        <*> configCardanoConfigurationCLIParser