[DEVOPS-1131] recordwildcards begone!

Author: cleverca22

auxx/cardano-sl-auxx.cabal

@@ -24,8 +24,6 @@ library
                        Command.Tx
                        Command.TyProjection
                        Command.Update
-                       Command.RunScript
-                       Command.LoadPlugin
                        Lang
                        Lang.Argument
                        Lang.Command
@@ -45,14 +43,8 @@ library
                      , MonadRandom
                      , ansi-wl-pprint
                      , async
-                     , cardano-sl-binary
                      , aeson
                      , base
-                     , ghc
-                     , ghc-paths
-                     , vector
-                     , cborg
-                     , reflection
                      , bytestring
                      , canonical-json
                      , cardano-sl

pkgs/default.nix

@@ -13759,11 +13759,9 @@ license = stdenv.lib.licenses.mit;
 , ansi-wl-pprint
 , async
 , base
-, brick
 , bytestring
 , canonical-json
 , cardano-sl
-, cardano-sl-binary
 , cardano-sl-chain
 , cardano-sl-chain-test
 , cardano-sl-client
@@ -13775,7 +13773,6 @@ license = stdenv.lib.licenses.mit;
 , cardano-sl-infra
 , cardano-sl-networking
 , cardano-sl-util
-, cborg
 , conduit
 , constraints
 , containers
@@ -13784,12 +13781,9 @@ license = stdenv.lib.licenses.mit;
 , Earley
 , formatting
 , generic-arbitrary
-, ghc
-, ghc-paths
 , haskeline
 , hspec
 , lens
-, lifted-async
 , loc
 , megaparsec
 , MonadRandom
@@ -13801,7 +13795,6 @@ license = stdenv.lib.licenses.mit;
 , QuickCheck
 , quickcheck-instances
 , random
-, reflection
 , resourcet
 , safe-exceptions
 , scientific
@@ -13818,8 +13811,6 @@ license = stdenv.lib.licenses.mit;
 , unliftio
 , unordered-containers
 , validation
-, vector
-, vty
 }:
 mkDerivation {
 
@@ -13842,7 +13833,6 @@ base
 bytestring
 canonical-json
 cardano-sl
-cardano-sl-binary
 cardano-sl-chain
 cardano-sl-chain-test
 cardano-sl-client
@@ -13853,16 +13843,13 @@ cardano-sl-db
 cardano-sl-generator
 cardano-sl-infra
 cardano-sl-util
-cborg
 conduit
 constraints
 containers
 data-default
 Earley
 formatting
 generic-arbitrary
-ghc
-ghc-paths
 haskeline
 lens
 loc
@@ -13875,7 +13862,6 @@ parser-combinators
 QuickCheck
 quickcheck-instances
 random
-reflection
 resourcet
 safe-exceptions
 scientific
@@ -13890,49 +13876,24 @@ unix
 unliftio
 unordered-containers
 validation
-vector
 ];
 libraryToolDepends = [
 cpphs
 ];
 executableHaskellDepends = [
-ansi-wl-pprint
 base
-brick
-bytestring
 cardano-sl
-cardano-sl-binary
 cardano-sl-chain
-cardano-sl-client
 cardano-sl-core
-cardano-sl-crypto
 cardano-sl-db
-cardano-sl-generator
 cardano-sl-infra
 cardano-sl-networking
 cardano-sl-util
-cborg
-conduit
-constraints
-containers
-data-default
 formatting
-lens
-lifted-async
-mtl
 network-transport-tcp
-optparse-applicative
-reflection
-resourcet
 safe-exceptions
-serokell-util
-stm
 temporary
-text
-transformers
 universum
-unordered-containers
-vty
 ];
 executableToolDepends = [
 cpphs

script-runner/AutomatedTestRunner.hs

@@ -5,7 +5,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving   #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
-{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE NamedFieldPuns #-}
 
@@ -122,7 +121,7 @@ scriptRunnerOptionsParser :: Parser ScriptRunnerOptions
 scriptRunnerOptionsParser = do
   srCommonNodeArgs <- CLI.commonNodeArgsParser
   srPeers <- many $ CLI.nodeIdOption "peer" "Address of a peer."
-  pure ScriptRunnerOptions{..}
+  pure ScriptRunnerOptions{srCommonNodeArgs,srPeers}
 
 usageExample :: Maybe Doc
 usageExample = Just "todo"
@@ -143,10 +142,10 @@ loggerName :: LoggerName
 loggerName = "script-runner"
 
 thing :: (TestScript a, HasCompileInfo) => ScriptRunnerOptions -> InputParams a -> IO ()
-thing opts@ScriptRunnerOptions{..} inputParams = do
+thing opts@ScriptRunnerOptions{srCommonNodeArgs} inputParams = do
   let
     conf = CLI.configurationOptions (CLI.commonArgs cArgs)
-    cArgs@CLI.CommonNodeArgs{..} = srCommonNodeArgs
+    cArgs@CLI.CommonNodeArgs{CLI.cnaDumpGenesisDataPath,CLI.cnaDumpConfiguration} = srCommonNodeArgs
   withConfigurations Nothing cnaDumpGenesisDataPath cnaDumpConfiguration conf (runWithConfig opts inputParams)
 
 maybeAddPeers :: [NodeId] -> NodeParams -> NodeParams
@@ -165,16 +164,15 @@ addQueuePolicies nodeParams = do
   }
 
 runWithConfig :: (TestScript a, HasCompileInfo, HasConfigurations) => ScriptRunnerOptions -> InputParams a -> Genesis.Config -> WalletConfiguration -> TxpConfiguration -> NtpConfiguration -> IO ()
-runWithConfig ScriptRunnerOptions{..} inputParams genesisConfig _walletConfig txpConfig _ntpConfig = do
+runWithConfig ScriptRunnerOptions{srCommonNodeArgs,srPeers} inputParams genesisConfig _walletConfig txpConfig _ntpConfig = do
   let
-    cArgs@CLI.CommonNodeArgs {..} = srCommonNodeArgs
-    nArgs = CLI.NodeArgs {behaviorConfigPath = Nothing}
-  (nodeParams', _mSscParams) <- CLI.getNodeParams loggerName cArgs nArgs (configGeneratedSecrets genesisConfig)
+    nArgs = CLI.NodeArgs { CLI.behaviorConfigPath = Nothing}
+  (nodeParams', _mSscParams) <- CLI.getNodeParams loggerName srCommonNodeArgs nArgs (configGeneratedSecrets genesisConfig)
   let
     nodeParams = addQueuePolicies $ maybeAddPeers srPeers $ nodeParams'
     epochSlots = configEpochSlots genesisConfig
     vssSK = fromMaybe (error "no user secret given") (npUserSecret nodeParams ^. usVss)
-    sscParams = CLI.gtSscParams cArgs vssSK (npBehaviorConfig nodeParams)
+    sscParams = CLI.gtSscParams srCommonNodeArgs vssSK (npBehaviorConfig nodeParams)
     thing1 = txpGlobalSettings genesisConfig txpConfig
     thing2 :: ReaderT InitModeContext IO ()
     thing2 = initNodeDBs genesisConfig