Merge pull request #5840 from IntersectMBO/mgalazyn/refactor/reorgani…

…ze-testnet-cli-functions Refactor: Reorganize testnet CLI functions
IntersectMBO · May 14, 2024 · fe33c2e · fe33c2e
2 parents 6c866f0 + bde2df6
commit fe33c2e
Show file tree

Hide file tree

Showing 41 changed files with 479 additions and 713 deletions.
diff --git a/cardano-node-chairman/test/Spec/Chairman/Cardano.hs b/cardano-node-chairman/test/Spec/Chairman/Cardano.hs
@@ -4,19 +4,20 @@
 
 module Spec.Chairman.Cardano where
 
-import qualified Cardano.Testnet as H
+import           Cardano.Testnet (NodeRuntime (nodeName), allNodes, cardanoDefaultTestnetOptions,
+                   cardanoTestnetDefault, mkConf)
 
-import qualified Testnet.Property.Util as H
+import           Testnet.Property.Util (integrationRetryWorkspace)
 
 import qualified Hedgehog as H
 
 import           Spec.Chairman.Chairman (chairmanOver)
 
 -- TODO: Conway broken in conway
 hprop_chairman :: H.Property
-hprop_chairman = H.integrationRetryWorkspace 2 "cardano-chairman" $ \tempAbsPath' -> do
-  conf <- H.mkConf tempAbsPath'
+hprop_chairman = integrationRetryWorkspace 2 "cardano-chairman" $ \tempAbsPath' -> do
+  conf <- mkConf tempAbsPath'
 
-  allNodes <- fmap H.nodeName . H.allNodes <$> H.cardanoTestnetDefault H.cardanoDefaultTestnetOptions conf
+  allNodes' <- fmap nodeName . allNodes <$> cardanoTestnetDefault cardanoDefaultTestnetOptions conf
 
-  chairmanOver 120 50 conf allNodes
+  chairmanOver 120 50 conf allNodes'
diff --git a/cardano-node-chairman/testnet/Main.hs b/cardano-node-chairman/testnet/Main.hs
diff --git a/cardano-node-chairman/testnet/Testnet/Commands.hs b/cardano-node-chairman/testnet/Testnet/Commands.hs
diff --git a/cardano-node-chairman/testnet/Testnet/Commands/Cardano.hs b/cardano-node-chairman/testnet/Testnet/Commands/Cardano.hs
diff --git a/cardano-node-chairman/testnet/Testnet/Commands/Version.hs b/cardano-node-chairman/testnet/Testnet/Commands/Version.hs
diff --git a/cardano-node-chairman/testnet/Testnet/Run.hs b/cardano-node-chairman/testnet/Testnet/Run.hs
diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -91,15 +91,16 @@ library
   exposed-modules:      Cardano.Testnet
                         Parsers.Run
                         Testnet.Components.Configuration
-                        Testnet.Components.DRep
                         Testnet.Components.Query
-                        Testnet.Components.SPO
                         Testnet.Components.TestWatchdog
                         Testnet.Defaults
                         Testnet.EpochStateProcessing
                         Testnet.Filepath
                         Testnet.Ping
-                        Testnet.Process.Cli
+                        Testnet.Process.Cli.DRep
+                        Testnet.Process.Cli.Keys
+                        Testnet.Process.Cli.SPO
+                        Testnet.Process.Cli.Transaction
                         Testnet.Process.Run
                         Testnet.Property.Assert
                         Testnet.Property.Run

diff --git a/cardano-testnet/src/Parsers/Cardano.hs b/cardano-testnet/src/Parsers/Cardano.hs
@@ -1,19 +1,21 @@
+{-# LANGUAGE NumericUnderscores #-}
 module Parsers.Cardano
   ( cmdCardano
   ) where
 
+import           Cardano.Api (bounded)
+
 import           Cardano.CLI.Environment
 import           Cardano.CLI.EraBased.Options.Common hiding (pNetworkId)
 import           Cardano.CLI.Legacy.Options
 
 import           Prelude
 
 import qualified Data.List as L
+import           Data.Word (Word64)
 import           Options.Applicative
 import qualified Options.Applicative as OA
 
-import           Testnet.Process.Cli (pNetworkId)
-import           Testnet.Property.Util
 import           Testnet.Start.Cardano
 import           Testnet.Start.Types
 import           Testnet.Types (readNodeLoggingFormat)
@@ -112,3 +114,22 @@ parseNodeConfigFile = NodeConfigurationYaml <$>
 
 cmdCardano :: EnvCli -> Mod CommandFields CardanoTestnetOptions
 cmdCardano envCli = command' "cardano" "Start a testnet in any era" (optsTestnet envCli)
+
+pNetworkId :: Parser Int
+pNetworkId =
+  OA.option (bounded "TESTNET_MAGIC") $ mconcat
+    [ OA.long "testnet-magic"
+    , OA.metavar "INT"
+    , OA.help "Specify a testnet magic id."
+    ]
+
+pMaxLovelaceSupply :: Parser Word64
+pMaxLovelaceSupply =
+  option auto
+      (   long "max-lovelace-supply"
+      <>  help "Max lovelace supply that your testnet starts with."
+      <>  metavar "WORD64"
+      <>  showDefault
+      <>  value 10_020_000_000
+      )
+