From aa769cd1f4d29fb6d6f8a36c4d66c5bb9ed717b3 Mon Sep 17 00:00:00 2001 From: Carl Hammann Date: Wed, 13 Dec 2023 13:24:25 +0100 Subject: [PATCH 1/4] Delete leftover golden files from #515 (for `query constitution-hash`) --- .../help/legacy_query_constitution-hash.cli | 26 ------------------- .../golden/help/query_constitution-hash.cli | 26 ------------------- 2 files changed, 52 deletions(-) delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_constitution-hash.cli delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/query_constitution-hash.cli diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_constitution-hash.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_constitution-hash.cli deleted file mode 100644 index 70251965e6..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_constitution-hash.cli +++ /dev/null @@ -1,26 +0,0 @@ -Usage: cardano-cli legacy query constitution-hash --socket-path SOCKET_PATH - [--cardano-mode - [--epoch-slots SLOTS]] - ( --mainnet - | --testnet-magic NATURAL - ) - [--out-file FILE] - - Get the constitution hash - -Available options: - --socket-path SOCKET_PATH - Path to the node socket. This overrides the - CARDANO_NODE_SOCKET_PATH environment variable. The - argument is optional if CARDANO_NODE_SOCKET_PATH is - defined and mandatory otherwise. - --cardano-mode For talking to a node running in full Cardano mode - (default). - --epoch-slots SLOTS The number of slots per epoch for the Byron era. - (default: 21600) - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --out-file FILE Optional output file. Default is to write to stdout. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_constitution-hash.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_constitution-hash.cli deleted file mode 100644 index 40506e7245..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_constitution-hash.cli +++ /dev/null @@ -1,26 +0,0 @@ -Usage: cardano-cli query constitution-hash --socket-path SOCKET_PATH - [--cardano-mode - [--epoch-slots SLOTS]] - ( --mainnet - | --testnet-magic NATURAL - ) - [--out-file FILE] - - Get the constitution hash - -Available options: - --socket-path SOCKET_PATH - Path to the node socket. This overrides the - CARDANO_NODE_SOCKET_PATH environment variable. The - argument is optional if CARDANO_NODE_SOCKET_PATH is - defined and mandatory otherwise. - --cardano-mode For talking to a node running in full Cardano mode - (default). - --epoch-slots SLOTS The number of slots per epoch for the Byron era. - (default: 21600) - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --out-file FILE Optional output file. Default is to write to stdout. - -h,--help Show this help text From 2a83ae2ef63644ebc533fcae7c5e488690921db5 Mon Sep 17 00:00:00 2001 From: Carl Hammann Date: Wed, 13 Dec 2023 13:26:03 +0100 Subject: [PATCH 2/4] Sharpen the all-or-some flags for stake pools --- .../Cardano/CLI/EraBased/Commands/Query.hs | 4 +- .../Cardano/CLI/EraBased/Options/Common.hs | 6 +- .../src/Cardano/CLI/EraBased/Options/Query.hs | 14 +- .../src/Cardano/CLI/EraBased/Run/Query.hs | 4 +- .../src/Cardano/CLI/Legacy/Commands/Query.hs | 4 +- cardano-cli/src/Cardano/CLI/Legacy/Options.hs | 8 +- cardano-cli/src/Cardano/CLI/Types/Common.hs | 2 +- .../cardano-cli-golden/files/golden/help.cli | 196 ++++++++++-------- .../allegra_query_leadership-schedule.cli | 3 +- .../golden/help/allegra_query_pool-params.cli | 13 +- .../golden/help/allegra_query_pool-state.cli | 13 +- .../help/allegra_query_stake-snapshot.cli | 14 +- ...e-address_stake-delegation-certificate.cli | 3 +- .../help/alonzo_query_leadership-schedule.cli | 3 +- .../golden/help/alonzo_query_pool-params.cli | 13 +- .../golden/help/alonzo_query_pool-state.cli | 13 +- .../help/alonzo_query_stake-snapshot.cli | 14 +- ...e-address_stake-delegation-certificate.cli | 3 +- .../babbage_query_leadership-schedule.cli | 3 +- .../golden/help/babbage_query_pool-params.cli | 13 +- .../golden/help/babbage_query_pool-state.cli | 13 +- .../help/babbage_query_stake-snapshot.cli | 14 +- ...e-address_stake-delegation-certificate.cli | 3 +- .../help/conway_governance_vote_create.cli | 3 +- .../help/conway_query_leadership-schedule.cli | 3 +- .../golden/help/conway_query_pool-params.cli | 13 +- .../golden/help/conway_query_pool-state.cli | 13 +- .../help/conway_query_stake-snapshot.cli | 14 +- ..._stake-and-vote-delegation-certificate.cli | 3 +- ...e-address_stake-delegation-certificate.cli | 3 +- .../help/latest_query_leadership-schedule.cli | 3 +- .../golden/help/latest_query_pool-params.cli | 13 +- .../golden/help/latest_query_pool-state.cli | 13 +- .../help/latest_query_stake-snapshot.cli | 14 +- ...e-address_stake-delegation-certificate.cli | 3 +- .../help/legacy_query_leadership-schedule.cli | 3 +- .../golden/help/legacy_query_pool-params.cli | 13 +- .../golden/help/legacy_query_pool-state.cli | 13 +- .../help/legacy_query_stake-snapshot.cli | 14 +- ...y_stake-address_delegation-certificate.cli | 3 +- .../help/mary_query_leadership-schedule.cli | 3 +- .../golden/help/mary_query_pool-params.cli | 13 +- .../golden/help/mary_query_pool-state.cli | 13 +- .../golden/help/mary_query_stake-snapshot.cli | 13 +- ...e-address_stake-delegation-certificate.cli | 3 +- .../golden/help/query_leadership-schedule.cli | 3 +- .../files/golden/help/query_pool-params.cli | 13 +- .../files/golden/help/query_pool-state.cli | 13 +- .../golden/help/query_stake-snapshot.cli | 13 +- .../shelley_query_leadership-schedule.cli | 3 +- .../golden/help/shelley_query_pool-params.cli | 13 +- .../golden/help/shelley_query_pool-state.cli | 13 +- .../help/shelley_query_stake-snapshot.cli | 14 +- ...e-address_stake-delegation-certificate.cli | 3 +- .../stake-address_delegation-certificate.cli | 3 +- 55 files changed, 364 insertions(+), 292 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs index cb3335ad54..ade3f69087 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs @@ -139,7 +139,7 @@ data QueryStakeSnapshotCmdArgs = QueryStakeSnapshotCmdArgs { nodeSocketPath :: !SocketPath , consensusModeParams :: !ConsensusModeParams , networkId :: !NetworkId - , allOrOnlyPoolIds :: !(AllOrOnly [Hash StakePoolKey]) + , allOrOnlyPoolIds :: !(AllOrOnly (Hash StakePoolKey)) , mOutFile :: !(Maybe (File () Out)) } deriving (Generic, Show) @@ -155,7 +155,7 @@ data QueryPoolStateCmdArgs = QueryPoolStateCmdArgs { nodeSocketPath :: !SocketPath , consensusModeParams :: !ConsensusModeParams , networkId :: !NetworkId - , allOrOnlyPoolIds :: !(AllOrOnly [Hash StakePoolKey]) + , allOrOnlyPoolIds :: !(AllOrOnly (Hash StakePoolKey)) } deriving (Generic, Show) data QueryTxMempoolCmdArgs = QueryTxMempoolCmdArgs diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index a1165f0ba5..0033bb43da 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -2294,10 +2294,8 @@ pStakePoolVerificationKeyHash prefix = Opt.option (pBech32KeyHash AsStakePoolKey <|> pHexHash AsStakePoolKey) $ mconcat [ Opt.long $ prefixFlag prefix "stake-pool-id" , Opt.metavar "STAKE_POOL_ID" - , Opt.help $ mconcat - [ "Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). " - , "Zero or more occurences of this option is allowed." - ] + , 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 a049fa87ff..677d07fc2e 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs @@ -189,15 +189,15 @@ pQueryProtocolStateCmd envCli = <*> pNetworkId envCli <*> pMaybeOutputFile -pAllStakePoolsOrOnly :: Parser (AllOrOnly [Hash StakePoolKey]) -pAllStakePoolsOrOnly = pAll <|> pOnly - where pAll :: Parser (AllOrOnly [Hash StakePoolKey]) +pAllStakePoolsOrSome :: Parser (AllOrOnly (Hash StakePoolKey)) +pAllStakePoolsOrSome = pAll <|> pOnly + where pAll :: Parser (AllOrOnly (Hash StakePoolKey)) pAll = Opt.flag' All $ mconcat [ Opt.long "all-stake-pools" , Opt.help "Query for all stake pools" ] - pOnly :: Parser (AllOrOnly [Hash StakePoolKey]) - pOnly = Only <$> many (pStakePoolVerificationKeyHash Nothing) + pOnly :: Parser (AllOrOnly (Hash StakePoolKey)) + pOnly = Some <$> pStakePoolVerificationKeyHash Nothing <*> many (pStakePoolVerificationKeyHash Nothing) pQueryStakeSnapshotCmd :: EnvCli -> Parser (QueryCmds era) pQueryStakeSnapshotCmd envCli = @@ -206,7 +206,7 @@ pQueryStakeSnapshotCmd envCli = <$> pSocketPath envCli <*> pConsensusModeParams <*> pNetworkId envCli - <*> pAllStakePoolsOrOnly + <*> pAllStakePoolsOrSome <*> pMaybeOutputFile pQueryPoolStateCmd :: EnvCli -> Parser (QueryCmds era) @@ -216,7 +216,7 @@ pQueryPoolStateCmd envCli = <$> pSocketPath envCli <*> pConsensusModeParams <*> pNetworkId envCli - <*> pAllStakePoolsOrOnly + <*> pAllStakePoolsOrSome pQueryTxMempoolCmd :: EnvCli -> Parser (QueryCmds era) pQueryTxMempoolCmd envCli = diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs index 2039980839..1b4df50765 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 - Only poolIds -> Just $ Set.fromList poolIds + Some poolId poolIds -> Just $ Set.fromList (poolId : poolIds) result <- lift (queryPoolState beo poolFilter) & onLeft (left . QueryCmdUnsupportedNtcVersion) @@ -715,7 +715,7 @@ runQueryStakeSnapshotCmd let poolFilter = case allOrOnlyPoolIds of All -> Nothing - Only poolIds -> Just $ Set.fromList poolIds + Some poolId poolIds -> Just $ Set.fromList (poolId : poolIds) beo <- requireEon BabbageEra era diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Query.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Query.hs index 2e26b72356..3cfd51c28f 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Query.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Query.hs @@ -129,7 +129,7 @@ data LegacyQueryStakeSnapshotCmdArgs = LegacyQueryStakeSnapshotCmdArgs { nodeSocketPath :: !SocketPath , consensusModeParams :: !ConsensusModeParams , networkId :: !NetworkId - , allOrOnlyPoolIds :: !(AllOrOnly [Hash StakePoolKey]) + , allOrOnlyPoolIds :: !(AllOrOnly (Hash StakePoolKey)) , mOutFile :: !(Maybe (File () Out)) } deriving (Generic, Show) @@ -145,7 +145,7 @@ data LegacyQueryPoolStateCmdArgs = LegacyQueryPoolStateCmdArgs { nodeSocketPath :: !SocketPath , consensusModeParams :: !ConsensusModeParams , networkId :: !NetworkId - , allOrOnlyPoolIds :: !(AllOrOnly [Hash StakePoolKey]) + , allOrOnlyPoolIds :: !(AllOrOnly (Hash StakePoolKey)) } deriving (Generic, Show) data LegacyQueryTxMempoolCmdArgs = LegacyQueryTxMempoolCmdArgs diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs index 13399e3809..96ffcd986d 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs @@ -696,15 +696,15 @@ pQueryCmds envCli = <*> pNetworkId envCli <*> pMaybeOutputFile - pAllStakePoolsOrOnly :: Parser (AllOrOnly [Hash StakePoolKey]) + pAllStakePoolsOrOnly :: Parser (AllOrOnly (Hash StakePoolKey)) pAllStakePoolsOrOnly = pAll <|> pOnly - where pAll :: Parser (AllOrOnly [Hash StakePoolKey]) + where pAll :: Parser (AllOrOnly (Hash StakePoolKey)) pAll = Opt.flag' All $ mconcat [ Opt.long "all-stake-pools" , Opt.help "Query for all stake pools" ] - pOnly :: Parser (AllOrOnly [Hash StakePoolKey]) - pOnly = Only <$> many (pStakePoolVerificationKeyHash Nothing) + pOnly :: Parser (AllOrOnly (Hash StakePoolKey)) + pOnly = Some <$> pStakePoolVerificationKeyHash Nothing <*> many (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 ef2febeea7..af56bc679a 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 | Only a deriving (Eq, Show) +data AllOrOnly a = All | Some a [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 c0ff9c4344..a1a248df5c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -539,10 +539,10 @@ Usage: cardano-cli shelley query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -554,9 +554,10 @@ Usage: cardano-cli shelley query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -597,9 +598,10 @@ Usage: cardano-cli shelley query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -1698,10 +1700,10 @@ Usage: cardano-cli allegra query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -1713,9 +1715,10 @@ Usage: cardano-cli allegra query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -1756,9 +1759,10 @@ Usage: cardano-cli allegra query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -2855,9 +2859,10 @@ Usage: cardano-cli mary query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -2869,9 +2874,10 @@ Usage: cardano-cli mary query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -2910,9 +2916,10 @@ Usage: cardano-cli mary 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] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -4002,10 +4009,10 @@ Usage: cardano-cli alonzo query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -4017,9 +4024,10 @@ Usage: cardano-cli alonzo query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -4060,9 +4068,10 @@ Usage: cardano-cli alonzo query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -5186,10 +5195,10 @@ Usage: cardano-cli babbage query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -5201,9 +5210,10 @@ Usage: cardano-cli babbage query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -5244,9 +5254,10 @@ Usage: cardano-cli babbage query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -6579,10 +6590,10 @@ Usage: cardano-cli conway query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -6594,9 +6605,10 @@ Usage: cardano-cli conway query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -6637,9 +6649,10 @@ Usage: cardano-cli conway query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -7880,10 +7893,10 @@ Usage: cardano-cli latest query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -7895,9 +7908,10 @@ Usage: cardano-cli latest query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -7938,9 +7952,10 @@ Usage: cardano-cli latest query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -8894,10 +8909,10 @@ Usage: cardano-cli legacy query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -8909,9 +8924,10 @@ Usage: cardano-cli legacy query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -8952,9 +8968,10 @@ Usage: cardano-cli legacy query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -10124,9 +10141,10 @@ Usage: cardano-cli query protocol-state --socket-path SOCKET_PATH 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] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -10135,9 +10153,10 @@ Usage: cardano-cli query stake-snapshot --socket-path SOCKET_PATH 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] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -10173,9 +10192,10 @@ Usage: cardano-cli query kes-period-info --socket-path SOCKET_PATH 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] - ] + ( --all-stake-pools + | --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_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_leadership-schedule.cli index 344d84a10f..324e7073e4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 37b6aaf42c..daa74ff28a 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 @@ -4,9 +4,10 @@ Usage: cardano-cli allegra query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 be066a0b27..e8866e4bc9 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 @@ -4,9 +4,10 @@ Usage: cardano-cli allegra query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -27,6 +28,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 916debe487..b4ede781ae 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 @@ -4,10 +4,10 @@ Usage: cardano-cli allegra query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -30,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli index 0a64f0804b..77bcc3a7bb 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli @@ -26,7 +26,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_leadership-schedule.cli index e232448c16..be445de961 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 a77a0bd3ce..d4fbee4bc8 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 @@ -4,9 +4,10 @@ Usage: cardano-cli alonzo query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 9dcc53d0b8..03e2ab5d41 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 @@ -4,9 +4,10 @@ Usage: cardano-cli alonzo query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -27,6 +28,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 23a75e2c16..ad8d31d25e 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 @@ -4,10 +4,10 @@ Usage: cardano-cli alonzo query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -30,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli index 5693c8177a..431a172a92 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli @@ -26,7 +26,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_leadership-schedule.cli index 1185005b00..b3aa278932 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 9361a0086c..bcba344ee5 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 @@ -4,9 +4,10 @@ Usage: cardano-cli babbage query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 a2edf8db6e..64a6848b61 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 @@ -4,9 +4,10 @@ Usage: cardano-cli babbage query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -27,6 +28,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 a888cab5b7..602f68345f 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 @@ -4,10 +4,10 @@ Usage: cardano-cli babbage query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -30,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli index 168e1c5126..fa992a2b23 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli @@ -26,7 +26,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_vote_create.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_vote_create.cli index 29dc516719..cb61ab3b03 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_vote_create.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_vote_create.cli @@ -35,8 +35,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --cc-hot-verification-key STRING Constitutional Committee hot key (hex-encoded). --cc-hot-verification-key-file FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_leadership-schedule.cli index e1f822ff29..fc956363bd 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 c0485733d9..0e4b3b353a 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 @@ -4,9 +4,10 @@ Usage: cardano-cli conway query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 9454c81ab5..9ff3b94d29 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 @@ -4,9 +4,10 @@ Usage: cardano-cli conway query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -27,6 +28,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 8dd3866fe2..88c1254c03 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 @@ -4,10 +4,10 @@ Usage: cardano-cli conway query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -30,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli index d3de7b566d..6b06a66567 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli @@ -33,8 +33,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --drep-script-hash HASH DRep script hash (hex-encoded). --drep-verification-key STRING DRep verification key (Bech32 or hex-encoded). diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli index a566b8691d..5a9e45ae12 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli @@ -26,7 +26,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_leadership-schedule.cli index eeb0cc64c6..5d97b4256e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 cf91a3addb..765faa91d5 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 @@ -4,9 +4,10 @@ Usage: cardano-cli latest query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 ee44a3e75b..3f6bf2a6bd 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 @@ -4,9 +4,10 @@ Usage: cardano-cli latest query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -27,6 +28,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 0b9c342ade..146f422cdd 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 @@ -4,10 +4,10 @@ Usage: cardano-cli latest query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -30,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli index 49b37496f3..ae37705743 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli @@ -26,7 +26,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_leadership-schedule.cli index 19fc04e282..c2aa5dde3f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 644c90f5d0..203528fe37 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 @@ -4,9 +4,10 @@ Usage: cardano-cli legacy query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 e519bfb47b..a819332ef2 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 @@ -4,9 +4,10 @@ Usage: cardano-cli legacy query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -27,6 +28,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 923a3efea4..abec85cced 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 @@ -4,10 +4,10 @@ Usage: cardano-cli legacy query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -30,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli index d4cd06b695..e8b0500f5c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli @@ -38,7 +38,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_leadership-schedule.cli index e47c5ee1c0..60f17f044b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 e49616c292..449b211938 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 @@ -4,9 +4,10 @@ Usage: cardano-cli mary query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 48242070cd..4b9f98a376 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 @@ -2,9 +2,10 @@ Usage: cardano-cli mary 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] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -25,6 +26,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 56650ae63c..1b37d3da71 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 @@ -4,9 +4,10 @@ Usage: cardano-cli mary query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -29,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli index d0e635596a..24077fc465 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli @@ -26,7 +26,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_leadership-schedule.cli index b7bbe6a23c..2b9b6fd870 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 ba376d44ab..6e020bc50d 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 @@ -1,9 +1,10 @@ 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] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -26,6 +27,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 621bfbfcf6..943bdc4781 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 @@ -1,9 +1,10 @@ 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] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -24,6 +25,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 6d5f50d6e6..2072119b4e 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 @@ -1,9 +1,10 @@ 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] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -26,7 +27,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_leadership-schedule.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_leadership-schedule.cli index 8d29ccd048..265fc28198 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_leadership-schedule.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_query_leadership-schedule.cli @@ -36,8 +36,7 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --vrf-signing-key-file FILE Input filepath of the VRF signing key. --current Get the leadership schedule for the current epoch. 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 6c3db76343..e6d41e72c1 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 @@ -4,9 +4,10 @@ Usage: cardano-cli shelley query pool-params --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) DEPRECATED. Use query pool-state instead. Dump the pool parameters (Ledger.NewEpochState.esLState._delegationState._pState._pParams -- advanced @@ -29,6 +30,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 8a42f980f8..6258d879ad 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 @@ -4,9 +4,10 @@ Usage: cardano-cli shelley query pool-state --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) Dump the pool state @@ -27,6 +28,8 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). -h,--help Show this help text 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 5325825992..dca268c166 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 @@ -4,10 +4,10 @@ Usage: cardano-cli shelley query stake-snapshot --socket-path SOCKET_PATH ( --mainnet | --testnet-magic NATURAL ) - [ --all-stake-pools - | - [--stake-pool-id STAKE_POOL_ID] - ] + ( --all-stake-pools + | --stake-pool-id STAKE_POOL_ID + [--stake-pool-id STAKE_POOL_ID] + ) [--out-file FILE] Obtain the three stake snapshots for a pool, plus the total active stake @@ -30,7 +30,9 @@ Available options: --all-stake-pools Query for all stake pools --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). + --stake-pool-id STAKE_POOL_ID + Stake pool ID/verification key hash (either + Bech32-encoded or hex-encoded). --out-file FILE Optional output file. Default is to write to stdout. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli index a4259f9e4d..adfa1c7363 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli @@ -26,7 +26,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli index dff68f87bc..aba66f34d3 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli @@ -38,7 +38,6 @@ Available options: Filepath of the stake pool verification key. --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. + Bech32-encoded or hex-encoded). --out-file FILE The output file. -h,--help Show this help text From 3bf8e62ab3bc9255a83f847df116590238b17941 Mon Sep 17 00:00:00 2001 From: Carl Hammann Date: Wed, 3 Jan 2024 15:40:42 +0100 Subject: [PATCH 3/4] Remove double help texts for `--stake-pool-id` --- .../src/Cardano/CLI/EraBased/Options/Common.hs | 18 +++++++++++------- .../src/Cardano/CLI/EraBased/Options/Query.hs | 2 +- cardano-cli/src/Cardano/CLI/Legacy/Options.hs | 2 +- .../golden/help/allegra_query_pool-params.cli | 3 --- .../golden/help/allegra_query_pool-state.cli | 3 --- .../help/allegra_query_stake-snapshot.cli | 3 --- .../golden/help/alonzo_query_pool-params.cli | 3 --- .../golden/help/alonzo_query_pool-state.cli | 3 --- .../help/alonzo_query_stake-snapshot.cli | 3 --- .../golden/help/babbage_query_pool-params.cli | 3 --- .../golden/help/babbage_query_pool-state.cli | 3 --- .../help/babbage_query_stake-snapshot.cli | 3 --- .../golden/help/conway_query_pool-params.cli | 3 --- .../golden/help/conway_query_pool-state.cli | 3 --- .../help/conway_query_stake-snapshot.cli | 3 --- .../golden/help/latest_query_pool-params.cli | 3 --- .../golden/help/latest_query_pool-state.cli | 3 --- .../help/latest_query_stake-snapshot.cli | 3 --- .../golden/help/legacy_query_pool-params.cli | 3 --- .../golden/help/legacy_query_pool-state.cli | 3 --- .../help/legacy_query_stake-snapshot.cli | 3 --- .../golden/help/mary_query_pool-params.cli | 3 --- .../golden/help/mary_query_pool-state.cli | 3 --- .../golden/help/mary_query_stake-snapshot.cli | 3 --- .../files/golden/help/query_pool-params.cli | 3 --- .../files/golden/help/query_pool-state.cli | 3 --- .../files/golden/help/query_stake-snapshot.cli | 3 --- .../golden/help/shelley_query_pool-params.cli | 3 --- .../golden/help/shelley_query_pool-state.cli | 3 --- .../help/shelley_query_stake-snapshot.cli | 3 --- 30 files changed, 13 insertions(+), 90 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 0033bb43da..02629512bd 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 + , VerificationKeyHash <$> pStakePoolVerificationKeyHash prefix True ] pCombinedStakePoolVerificationKeyOrHashOrFile @@ -2288,14 +2288,18 @@ pAddress = , Opt.help "A Cardano address" ] --- | First argument is the prefix to use -pStakePoolVerificationKeyHash :: Maybe String -> Parser (Hash StakePoolKey) -pStakePoolVerificationKeyHash prefix = - Opt.option (pBech32KeyHash AsStakePoolKey <|> pHexHash AsStakePoolKey) $ mconcat +-- | 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 + ) [ 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 677d07fc2e..f22fd07c68 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 <*> many (pStakePoolVerificationKeyHash Nothing) + pOnly = Some <$> pStakePoolVerificationKeyHash Nothing True <*> many (pStakePoolVerificationKeyHash Nothing False) pQueryStakeSnapshotCmd :: EnvCli -> Parser (QueryCmds era) pQueryStakeSnapshotCmd envCli = diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs index 96ffcd986d..871b58e6c8 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 <*> many (pStakePoolVerificationKeyHash Nothing) + pOnly = Some <$> pStakePoolVerificationKeyHash Nothing True <*> many (pStakePoolVerificationKeyHash Nothing False) pQueryStakeSnapshot :: Parser LegacyQueryCmds pQueryStakeSnapshot = 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 daa74ff28a..ace0163abb 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 e8866e4bc9..2f2d1cd420 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 @@ -26,9 +26,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 b4ede781ae..36a398d579 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 d4fbee4bc8..da438af52d 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 03e2ab5d41..1ccd573447 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 @@ -26,9 +26,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 ad8d31d25e..cad6256ae4 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 bcba344ee5..6d2fcdf0ff 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 64a6848b61..1840306bfa 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 @@ -26,9 +26,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 602f68345f..e7681ae799 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 0e4b3b353a..6a25d58c91 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 9ff3b94d29..ec469f808e 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 @@ -26,9 +26,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 88c1254c03..7726a4afc7 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 765faa91d5..8d38a9debd 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 3f6bf2a6bd..eb04dff956 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 @@ -26,9 +26,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 146f422cdd..f861cf94fd 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 203528fe37..d8fab393f6 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 a819332ef2..e9769ea689 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 @@ -26,9 +26,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 abec85cced..856e933d04 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 449b211938..4ccbd99d62 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 4b9f98a376..4e3b2bcbad 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 @@ -24,9 +24,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 1b37d3da71..514758a3c9 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 6e020bc50d..d5d15718f5 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 @@ -25,9 +25,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 943bdc4781..d96dad0bc5 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 @@ -23,9 +23,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 2072119b4e..c3d45229b1 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 @@ -25,9 +25,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 e6d41e72c1..7f3430c030 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 6258d879ad..343b3a9ec4 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 @@ -26,9 +26,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). 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 dca268c166..16064e149e 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 @@ -28,9 +28,6 @@ Available options: --testnet-magic NATURAL Specify a testnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable --all-stake-pools Query for all stake pools - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). --stake-pool-id STAKE_POOL_ID Stake pool ID/verification key hash (either Bech32-encoded or hex-encoded). From 4823900f804a3b0c70831f09780768a736e4ec74 Mon Sep 17 00:00:00 2001 From: Carl Hammann Date: Thu, 4 Jan 2024 15:33:59 +0100 Subject: [PATCH 4/4] Use `some` instead of one plus `many` --- .../Cardano/CLI/EraBased/Options/Common.hs | 18 ++--- .../src/Cardano/CLI/EraBased/Options/Query.hs | 2 +- .../src/Cardano/CLI/EraBased/Run/Query.hs | 4 +- cardano-cli/src/Cardano/CLI/Legacy/Options.hs | 2 +- cardano-cli/src/Cardano/CLI/Types/Common.hs | 2 +- .../cardano-cli-golden/files/golden/help.cli | 81 +++++++------------ .../golden/help/allegra_query_pool-params.cli | 3 +- .../golden/help/allegra_query_pool-state.cli | 3 +- .../help/allegra_query_stake-snapshot.cli | 3 +- .../golden/help/alonzo_query_pool-params.cli | 3 +- .../golden/help/alonzo_query_pool-state.cli | 3 +- .../help/alonzo_query_stake-snapshot.cli | 3 +- .../golden/help/babbage_query_pool-params.cli | 3 +- .../golden/help/babbage_query_pool-state.cli | 3 +- .../help/babbage_query_stake-snapshot.cli | 3 +- .../golden/help/conway_query_pool-params.cli | 3 +- .../golden/help/conway_query_pool-state.cli | 3 +- .../help/conway_query_stake-snapshot.cli | 3 +- .../golden/help/latest_query_pool-params.cli | 3 +- .../golden/help/latest_query_pool-state.cli | 3 +- .../help/latest_query_stake-snapshot.cli | 3 +- .../golden/help/legacy_query_pool-params.cli | 3 +- .../golden/help/legacy_query_pool-state.cli | 3 +- .../help/legacy_query_stake-snapshot.cli | 3 +- .../golden/help/mary_query_pool-params.cli | 3 +- .../golden/help/mary_query_pool-state.cli | 3 +- .../golden/help/mary_query_stake-snapshot.cli | 3 +- .../files/golden/help/query_pool-params.cli | 3 +- .../files/golden/help/query_pool-state.cli | 3 +- .../golden/help/query_stake-snapshot.cli | 3 +- .../golden/help/shelley_query_pool-params.cli | 3 +- .../golden/help/shelley_query_pool-state.cli | 3 +- .../help/shelley_query_stake-snapshot.cli | 3 +- 33 files changed, 66 insertions(+), 124 deletions(-) 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]