diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 02629512bd..0033bb43da 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -934,7 +934,7 @@ pStakePoolVerificationKeyOrHashOrFile pStakePoolVerificationKeyOrHashOrFile prefix = asum [ VerificationKeyOrFile <$> pStakePoolVerificationKeyOrFile prefix - , VerificationKeyHash <$> pStakePoolVerificationKeyHash prefix True + , VerificationKeyHash <$> pStakePoolVerificationKeyHash prefix ] pCombinedStakePoolVerificationKeyOrHashOrFile @@ -2288,18 +2288,14 @@ pAddress = , Opt.help "A Cardano address" ] --- | First argument is the prefix to use, second argument is whether we show the long help text -pStakePoolVerificationKeyHash :: Maybe String -> Bool -> Parser (Hash StakePoolKey) -pStakePoolVerificationKeyHash prefix showHelp = - Opt.option (pBech32KeyHash AsStakePoolKey <|> pHexHash AsStakePoolKey) $ mconcat $ - (if showHelp - then (Opt.help - "Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded)." - :) - else id - ) +-- | First argument is the prefix to use +pStakePoolVerificationKeyHash :: Maybe String -> Parser (Hash StakePoolKey) +pStakePoolVerificationKeyHash prefix = + Opt.option (pBech32KeyHash AsStakePoolKey <|> pHexHash AsStakePoolKey) $ mconcat [ Opt.long $ prefixFlag prefix "stake-pool-id" , Opt.metavar "STAKE_POOL_ID" + , Opt.help + "Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded)." ] pVrfVerificationKeyFile :: Parser (VerificationKeyFile In) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs index f22fd07c68..8b9b1424f7 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs @@ -197,7 +197,7 @@ pAllStakePoolsOrSome = pAll <|> pOnly , Opt.help "Query for all stake pools" ] pOnly :: Parser (AllOrOnly (Hash StakePoolKey)) - pOnly = Some <$> pStakePoolVerificationKeyHash Nothing True <*> many (pStakePoolVerificationKeyHash Nothing False) + pOnly = Only <$> some (pStakePoolVerificationKeyHash Nothing) pQueryStakeSnapshotCmd :: EnvCli -> Parser (QueryCmds era) pQueryStakeSnapshotCmd envCli = diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs index 1b4df50765..2039980839 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs @@ -635,7 +635,7 @@ runQueryPoolStateCmd let poolFilter = case allOrOnlyPoolIds of All -> Nothing - Some poolId poolIds -> Just $ Set.fromList (poolId : poolIds) + Only poolIds -> Just $ Set.fromList poolIds result <- lift (queryPoolState beo poolFilter) & onLeft (left . QueryCmdUnsupportedNtcVersion) @@ -715,7 +715,7 @@ runQueryStakeSnapshotCmd let poolFilter = case allOrOnlyPoolIds of All -> Nothing - Some poolId poolIds -> Just $ Set.fromList (poolId : poolIds) + Only poolIds -> Just $ Set.fromList poolIds beo <- requireEon BabbageEra era diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs index 871b58e6c8..866c9a9268 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs @@ -704,7 +704,7 @@ pQueryCmds envCli = , Opt.help "Query for all stake pools" ] pOnly :: Parser (AllOrOnly (Hash StakePoolKey)) - pOnly = Some <$> pStakePoolVerificationKeyHash Nothing True <*> many (pStakePoolVerificationKeyHash Nothing False) + pOnly = Only <$> some (pStakePoolVerificationKeyHash Nothing) pQueryStakeSnapshot :: Parser LegacyQueryCmds pQueryStakeSnapshot = diff --git a/cardano-cli/src/Cardano/CLI/Types/Common.hs b/cardano-cli/src/Cardano/CLI/Types/Common.hs index af56bc679a..dc836be250 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Common.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Common.hs @@ -291,7 +291,7 @@ data KeyOutputFormat | KeyOutputFormatBech32 deriving (Eq, Show) -data AllOrOnly a = All | Some a [a] deriving (Eq, Show) +data AllOrOnly a = All | Only [a] deriving (Eq, Show) -- | This data structure is used to allow nicely formatted output in the query pool-params command. -- params are the current pool parameter settings, futureparams are new parameters, retiringEpoch is the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli index a1a248df5c..06c947d2b1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -540,8 +540,7 @@ Usage: cardano-cli shelley query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -555,8 +554,7 @@ Usage: cardano-cli shelley query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -599,8 +597,7 @@ Usage: cardano-cli shelley query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -1701,8 +1698,7 @@ Usage: cardano-cli allegra query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -1716,8 +1712,7 @@ Usage: cardano-cli allegra query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -1760,8 +1755,7 @@ Usage: cardano-cli allegra query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -2860,8 +2854,7 @@ Usage: cardano-cli mary query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -2875,8 +2868,7 @@ Usage: cardano-cli mary query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -2917,8 +2909,7 @@ Usage: cardano-cli mary query pool-state --socket-path SOCKET_PATH [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -4010,8 +4001,7 @@ Usage: cardano-cli alonzo query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -4025,8 +4015,7 @@ Usage: cardano-cli alonzo query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -4069,8 +4058,7 @@ Usage: cardano-cli alonzo query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -5196,8 +5184,7 @@ Usage: cardano-cli babbage query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -5211,8 +5198,7 @@ Usage: cardano-cli babbage query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -5255,8 +5241,7 @@ Usage: cardano-cli babbage query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -6591,8 +6576,7 @@ Usage: cardano-cli conway query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -6606,8 +6590,7 @@ Usage: cardano-cli conway query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -6650,8 +6633,7 @@ Usage: cardano-cli conway query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -7894,8 +7876,7 @@ Usage: cardano-cli latest query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -7909,8 +7890,7 @@ Usage: cardano-cli latest query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -7953,8 +7933,7 @@ Usage: cardano-cli latest query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -8910,8 +8889,7 @@ Usage: cardano-cli legacy query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -8925,8 +8903,7 @@ Usage: cardano-cli legacy query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -8969,8 +8946,7 @@ Usage: cardano-cli legacy query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state @@ -10142,8 +10118,7 @@ Usage: cardano-cli query stake-snapshot --socket-path SOCKET_PATH [--cardano-mode [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] @@ -10154,8 +10129,7 @@ Usage: cardano-cli query pool-params --socket-path SOCKET_PATH [--cardano-mode [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters @@ -10193,8 +10167,7 @@ Usage: cardano-cli query pool-state --socket-path SOCKET_PATH [--cardano-mode [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-params.cli index ace0163abb..3cb69397a3 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli allegra query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-state.cli index 2f2d1cd420..d20a2f1ba5 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_pool-state.cli @@ -5,8 +5,7 @@ Usage: cardano-cli allegra query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-snapshot.cli index 36a398d579..9c091a66d4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli allegra query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-params.cli index da438af52d..e0008bab89 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli alonzo query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-state.cli index 1ccd573447..1191842dee 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_pool-state.cli @@ -5,8 +5,7 @@ Usage: cardano-cli alonzo query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_stake-snapshot.cli index cad6256ae4..27a93422cc 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli alonzo query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-params.cli index 6d2fcdf0ff..3f0ee3e848 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli babbage query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-state.cli index 1840306bfa..18b9e408e9 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_pool-state.cli @@ -5,8 +5,7 @@ Usage: cardano-cli babbage query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_stake-snapshot.cli index e7681ae799..5dd5fc1068 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli babbage query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-params.cli index 6a25d58c91..abbd2e1db9 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli conway query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-state.cli index ec469f808e..627d291e0a 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_pool-state.cli @@ -5,8 +5,7 @@ Usage: cardano-cli conway query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_stake-snapshot.cli index 7726a4afc7..fc9bf2ee5d 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli conway query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-params.cli index 8d38a9debd..724fce8818 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli latest query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-state.cli index eb04dff956..5f35a515e8 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_pool-state.cli @@ -5,8 +5,7 @@ Usage: cardano-cli latest query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_stake-snapshot.cli index f861cf94fd..7c8a9b14fe 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli latest query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-params.cli index d8fab393f6..7eb326ffbd 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli legacy query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-state.cli index e9769ea689..c382236bd5 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_pool-state.cli @@ -5,8 +5,7 @@ Usage: cardano-cli legacy query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_stake-snapshot.cli index 856e933d04..756142e286 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli legacy query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-params.cli index 4ccbd99d62..b8e3744e24 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli mary query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-state.cli index 4e3b2bcbad..a095e5baa2 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_pool-state.cli @@ -3,8 +3,7 @@ Usage: cardano-cli mary query pool-state --socket-path SOCKET_PATH [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_stake-snapshot.cli index 514758a3c9..f1c7103727 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli mary query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-params.cli index d5d15718f5..39de86e416 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-params.cli @@ -2,8 +2,7 @@ Usage: cardano-cli query pool-params --socket-path SOCKET_PATH [--cardano-mode [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-state.cli index d96dad0bc5..0fb3f65245 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_pool-state.cli @@ -2,8 +2,7 @@ Usage: cardano-cli query pool-state --socket-path SOCKET_PATH [--cardano-mode [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_stake-snapshot.cli index c3d45229b1..7d42da620a 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_stake-snapshot.cli @@ -2,8 +2,7 @@ Usage: cardano-cli query stake-snapshot --socket-path SOCKET_PATH [--cardano-mode [--epoch-slots SLOTS]] (--mainnet | --testnet-magic NATURAL) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-params.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-params.cli index 7f3430c030..f67564d43c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-params.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-params.cli @@ -5,8 +5,7 @@ Usage: cardano-cli shelley query pool-params --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) DEPRECATED. Use query pool-state instead. Dump the pool parameters diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-state.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-state.cli index 343b3a9ec4..a1abff2c4d 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-state.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_pool-state.cli @@ -5,8 +5,7 @@ Usage: cardano-cli shelley query pool-state --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) Dump the pool state diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_stake-snapshot.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_stake-snapshot.cli index 16064e149e..e9e1f86f8e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_stake-snapshot.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_stake-snapshot.cli @@ -5,8 +5,7 @@ Usage: cardano-cli shelley query stake-snapshot --socket-path SOCKET_PATH | --testnet-magic NATURAL ) ( --all-stake-pools - | --stake-pool-id STAKE_POOL_ID - [--stake-pool-id STAKE_POOL_ID] + | (--stake-pool-id STAKE_POOL_ID) ) [--out-file FILE]