create-testnet-data: use experimental API and make arguments era specific #968
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| {-# LANGUAGE DataKinds #-} | ||
| {-# LANGUAGE DuplicateRecordFields #-} | ||
| {-# LANGUAGE ExistentialQuantification #-} | ||
| {-# LANGUAGE LambdaCase #-} | ||
|
|
||
| module Cardano.CLI.EraBased.Commands.Genesis | ||
|
|
@@ -19,6 +20,7 @@ module Cardano.CLI.EraBased.Commands.Genesis | |
| where | ||
|
|
||
| import qualified Cardano.Api.Byron as Byron | ||
| import qualified Cardano.Api.Experimental as Exp | ||
| import Cardano.Api.Ledger (Coin) | ||
| import Cardano.Api.Shelley | ||
|
|
||
|
|
@@ -30,7 +32,7 @@ data GenesisCmds era | |
| = GenesisCreate !(GenesisCreateCmdArgs era) | ||
| | GenesisCreateCardano !(GenesisCreateCardanoCmdArgs era) | ||
| | GenesisCreateStaked !(GenesisCreateStakedCmdArgs era) | ||
| | GenesisCreateTestNetData !GenesisCreateTestNetDataCmdArgs | ||
| | GenesisKeyGenGenesis !GenesisKeyGenGenesisCmdArgs | ||
| | GenesisKeyGenDelegate !GenesisKeyGenDelegateCmdArgs | ||
| | GenesisKeyGenUTxO !GenesisKeyGenUTxOCmdArgs | ||
|
|
@@ -92,8 +94,10 @@ data GenesisCreateStakedCmdArgs era = GenesisCreateStakedCmdArgs | |
| } | ||
| deriving Show | ||
|
|
||
| -- TODO This existential type parameter should become a regular type parameter | ||
| -- when we parameterize the parent type by the experimental era API. | ||
| data GenesisCreateTestNetDataCmdArgs = forall era. GenesisCreateTestNetDataCmdArgs | ||
| { eon :: !(Exp.Era era) | ||
| , specShelley :: !(Maybe FilePath) | ||
| -- ^ Path to the @genesis-shelley@ file to use. If unspecified, a default one will be used. | ||
| , specAlonzo :: !(Maybe FilePath) | ||
|
|
@@ -127,7 +131,9 @@ data GenesisCreateTestNetDataCmdArgs era = GenesisCreateTestNetDataCmdArgs | |
| , outputDir :: !FilePath | ||
| -- ^ Directory where to write credentials and files. | ||
| } | ||
|
|
||
| instance Show GenesisCreateTestNetDataCmdArgs where | ||
| show _ = "GenesisCreateTestNetDataCmdArgs" | ||
|
There was a problem hiding this comment. It doesn't derive anymore? It is odd because There was a problem hiding this comment. @palas> it doesn't derive anymore because there's an existential type in
|
||
|
|
||
| data GenesisKeyGenGenesisCmdArgs = GenesisKeyGenGenesisCmdArgs | ||
| { verificationKeyPath :: !(VerificationKeyFile Out) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ where | |
|
|
||
| import Cardano.Api hiding (QueryInShelleyBasedEra (..)) | ||
| import qualified Cardano.Api.Byron as Byron | ||
| import qualified Cardano.Api.Experimental as Exp | ||
| import Cardano.Api.Ledger (Coin (..)) | ||
|
|
||
| import Cardano.CLI.Environment (EnvCli (..)) | ||
|
|
@@ -217,18 +218,18 @@ pGenesisCreateStaked sbe envCli = | |
| pRelayJsonFp = | ||
| parseFilePath "relay-specification-file" "JSON file that specifies the relays of each stake pool." | ||
|
|
||
| pGenesisCreateTestNetData :: Exp.Era era -> EnvCli -> Parser (GenesisCmds era) | ||
| pGenesisCreateTestNetData era envCli = | ||
| fmap GenesisCreateTestNetData $ | ||
| GenesisCreateTestNetDataCmdArgs era | ||
| <$> optional (pSpecFile "shelley") | ||
| <*> optional (pSpecFile "alonzo") | ||
| <*> optional (pSpecFile "conway") | ||
| <*> pNumGenesisKeys | ||
| <*> pNumPools | ||
| <*> pNumStakeDelegs | ||
| <*> (case era of Exp.BabbageEra -> pure 0; Exp.ConwayEra -> pNumCommittee) -- Committee doesn't exist in babbage | ||
| <*> (case era of Exp.BabbageEra -> pure $ DRepCredentials OnDisk 0; Exp.ConwayEra -> pNumDReps) -- DReps don't exist in babbage | ||
|
There was a problem hiding this comment. Making it unrepresentable on the type would be safer. But this is probably much simpler, so it seems a reasonable trade-off There was a problem hiding this comment. Those inlined cases are not very readable, can you move them to a values in There was a problem hiding this comment. I'd also use if someEra < Some Exp.ConwayEra
then pure 0
else pNumCommitteeand if someEra < Some Exp.ConwayEra
then pure $ DRepCredentials OnDisk 0
else pNumDRepsRationale: less maintenance burden when introducing new eras - you won't have to change each usage site of There was a problem hiding this comment.
@carbolymer> I'm not sure this is really better, because there are at most two experimental eras at any point in time and when we delete one era, the index of the other era (the one being kept) shrinks from 1 to 0. So I wouldn't rely on the ordering here. I think pattern matching makes the intent more explicit. |
||
| <*> pNumStuffedUtxoCount | ||
| <*> pNumUtxoKeys | ||
| <*> pSupply | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not
Some Exp.Erainstead?