From fcd1be639545f008784acfb4f2bf2b306dd5f3c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Wed, 6 Mar 2024 17:49:30 +0100 Subject: [PATCH] Follow-ups of create-testnet-data+relays --- cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs | 2 +- cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs | 3 +-- .../files/golden/help/allegra_genesis_create-staked.cli | 3 ++- .../files/golden/help/alonzo_genesis_create-staked.cli | 3 ++- .../files/golden/help/babbage_genesis_create-staked.cli | 3 ++- .../files/golden/help/conway_genesis_create-staked.cli | 3 ++- .../files/golden/help/latest_genesis_create-staked.cli | 3 ++- .../files/golden/help/mary_genesis_create-staked.cli | 3 ++- .../files/golden/help/shelley_genesis_create-staked.cli | 3 ++- 9 files changed, 16 insertions(+), 10 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs index aafa66b9e1..f440612e82 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs @@ -204,7 +204,7 @@ pGenesisCreateStaked envCli = Opt.strOption $ mconcat [ Opt.long "relay-specification-file" , Opt.metavar "FILE" - , Opt.help "JSON file specified the relays of each stake pool." + , Opt.help "JSON file that specifies the relays of each stake pool." , Opt.completer (Opt.bashCompleter "file") ] diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs index f576a55b14..70eeb86b0c 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs @@ -654,9 +654,8 @@ readAndDecodeShelleyGenesis fpath = runExceptT $ do -- @readRelays fp@ reads the relays specification from a file readRelays :: () => MonadIO m - => FromJSON a => FilePath -- ^ The file to read from - -> ExceptT GenesisCmdError m a + -> ExceptT GenesisCmdError m (Map Word [L.StakePoolRelay]) readRelays fp = do relaySpecJsonBs <- handleIOExceptT (GenesisCmdStakePoolRelayFileError fp) (LBS.readFile fp) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_genesis_create-staked.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_genesis_create-staked.cli index 2d5018aa6f..9e769e8579 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_genesis_create-staked.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_genesis_create-staked.cli @@ -53,5 +53,6 @@ Available options: --num-stuffed-utxo INT The number of fake UTxO entries to generate [default is 0]. --relay-specification-file FILE - JSON file specified the relays of each stake pool. + JSON file that specifies the relays of each stake + pool. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_genesis_create-staked.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_genesis_create-staked.cli index ab0aae3db3..a62ef03a49 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_genesis_create-staked.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_genesis_create-staked.cli @@ -53,5 +53,6 @@ Available options: --num-stuffed-utxo INT The number of fake UTxO entries to generate [default is 0]. --relay-specification-file FILE - JSON file specified the relays of each stake pool. + JSON file that specifies the relays of each stake + pool. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_genesis_create-staked.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_genesis_create-staked.cli index 343db296d6..ea4db9f9fc 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_genesis_create-staked.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_genesis_create-staked.cli @@ -53,5 +53,6 @@ Available options: --num-stuffed-utxo INT The number of fake UTxO entries to generate [default is 0]. --relay-specification-file FILE - JSON file specified the relays of each stake pool. + JSON file that specifies the relays of each stake + pool. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_genesis_create-staked.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_genesis_create-staked.cli index d006ca91d4..5059e632f4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_genesis_create-staked.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_genesis_create-staked.cli @@ -53,5 +53,6 @@ Available options: --num-stuffed-utxo INT The number of fake UTxO entries to generate [default is 0]. --relay-specification-file FILE - JSON file specified the relays of each stake pool. + JSON file that specifies the relays of each stake + pool. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_genesis_create-staked.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_genesis_create-staked.cli index a845fc0df6..acbf194b5e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_genesis_create-staked.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_genesis_create-staked.cli @@ -53,5 +53,6 @@ Available options: --num-stuffed-utxo INT The number of fake UTxO entries to generate [default is 0]. --relay-specification-file FILE - JSON file specified the relays of each stake pool. + JSON file that specifies the relays of each stake + pool. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_genesis_create-staked.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_genesis_create-staked.cli index aae4c0c8d4..7812d2289c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_genesis_create-staked.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_genesis_create-staked.cli @@ -53,5 +53,6 @@ Available options: --num-stuffed-utxo INT The number of fake UTxO entries to generate [default is 0]. --relay-specification-file FILE - JSON file specified the relays of each stake pool. + JSON file that specifies the relays of each stake + pool. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_genesis_create-staked.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_genesis_create-staked.cli index f7ed470787..5685e8b05f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_genesis_create-staked.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_genesis_create-staked.cli @@ -53,5 +53,6 @@ Available options: --num-stuffed-utxo INT The number of fake UTxO entries to generate [default is 0]. --relay-specification-file FILE - JSON file specified the relays of each stake pool. + JSON file that specifies the relays of each stake + pool. -h,--help Show this help text