Skip to content

Commit

Permalink
Implementing NetworkId parser
Browse files Browse the repository at this point in the history
  • Loading branch information
Jimbo4350 committed Jun 5, 2023
1 parent 07a74b1 commit 23b81f8
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cardano-testnet/src/Parsers/Babbage.hs
Expand Up @@ -9,7 +9,7 @@ import Prelude
import Options.Applicative
import qualified Options.Applicative as OA

import Cardano.CLI.Common.Parsers
import Cardano.CLI.Common.Parsers hiding (pNetworkId)

import Testnet
import Testnet.Options
Expand Down Expand Up @@ -44,7 +44,7 @@ optsTestnet = BabbageTestnetOptions
<> OA.showDefault
<> OA.value (babbageSecurityParam defaultTestnetOptions)
)
<*> error "testnetmagic"
<*> pNetworkId
<*> OA.option auto
( OA.long "total-balance"
<> OA.help "Total balance"
Expand Down
1 change: 1 addition & 0 deletions cardano-testnet/src/Testnet/Parsers.hs
Expand Up @@ -46,6 +46,7 @@ commands =
, fmap (Help pref opts) (subparser cmdHelp)
]


runTestnetCmd :: CardanoTestnetCommands -> IO ()
runTestnetCmd = \case
StartBabbageTestnet cmdOpts -> runBabbageOptions cmdOpts
Expand Down
23 changes: 23 additions & 0 deletions cardano-testnet/src/Testnet/Util/Cli.hs
Expand Up @@ -25,6 +25,10 @@ module Testnet.Util.Cli
, cliByronSigningKeyAddress
) where

import Cardano.Api (NetworkId (..), NetworkMagic (..), bounded)

Check warning on line 28 in cardano-testnet/src/Testnet/Util/Cli.hs

View workflow job for this annotation

GitHub Actions / build

Warning in module Testnet.Util.Cli: Use fewer imports ▫︎ Found: "import Cardano.Api ( NetworkId(..), NetworkMagic(..), bounded )\nimport Cardano.Api\n ( ByronAddr, ByronKeyLegacy, PaymentKey, StakeKey )\n" ▫︎ Perhaps: "import Cardano.Api\n ( NetworkId(..),\n NetworkMagic(..),\n bounded,\n ByronAddr,\n ByronKeyLegacy,\n PaymentKey,\n StakeKey )\n"

import Options.Applicative
import qualified Options.Applicative as Opt
import System.FilePath.Posix

import qualified Hedgehog.Extras.Test.Base as H
Expand Down Expand Up @@ -136,3 +140,22 @@ cliByronSigningKeyAddress tmp testnetMagic (File key) destPath = do
]
H.writeFile addrPath addr
return $ File addrPath

pNetworkId :: Parser NetworkId
pNetworkId =
Opt.flag' Mainnet $ mconcat
[ Opt.long "mainnet"
, Opt.help $ mconcat
[ "Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID "
, "environment variable"
]
]
<|>
fmap (Testnet . NetworkMagic) $ Opt.option (bounded "TESTNET_MAGIC") $ mconcat
[ Opt.long "testnet-magic"
, Opt.metavar "NATURAL"
, Opt.help $ mconcat
[ "Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID "
, "environment variable"
]
]

0 comments on commit 23b81f8

Please sign in to comment.