Merge pull request #636 from IntersectMBO/smelc/create-testnet-data-r…

…elays-follow-ups Follow-ups of create-testnet-data+relays
IntersectMBO · Mar 6, 2024 · b4e3965 · b4e3965
2 parents b0ede7b + fcd1be6
commit b4e3965
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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