diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs index e5bef18aba..a070e977db 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs @@ -1160,8 +1160,8 @@ pQueryCmd envCli = <*> pOperationalCertificateFile <*> pMaybeOutputFile -pGovernanceVoteCmd :: EnvCli -> Parser GovernanceVoteCmd -pGovernanceVoteCmd envCli = +pGovernanceVoteCmd :: Parser GovernanceVoteCmd +pGovernanceVoteCmd = asum [ subParser "create" $ Opt.info pVoteCreate @@ -1169,9 +1169,6 @@ pGovernanceVoteCmd envCli = , subParser "view" $ Opt.info pVoteView $ Opt.progDesc "View a vote" - , subParser "submit" - $ Opt.info pVoteSubmit - $ Opt.progDesc "Submit a vote" ] where pVoteCreate :: Parser GovernanceVoteCmd @@ -1187,13 +1184,6 @@ pGovernanceVoteCmd envCli = GovernanceVoteView <$> pVoteFileIn - pVoteSubmit :: Parser GovernanceVoteCmd - pVoteSubmit = - GovernanceVoteSubmit - <$> pSocketPath envCli - <*> pNetworkId envCli - <*> pVoteFileIn - pVote :: Parser Vote pVote = asum @@ -1259,9 +1249,6 @@ pGovernanceActionCmd envCli = , subParser "query" $ Opt.info pActionQuery $ Opt.progDesc "Query an on-chain action" - , subParser "submit" - $ Opt.info pActionSubmit - $ Opt.progDesc "Submit an action" ] where pActionCreateNoConfidenceMotion :: Parser GovernanceActionCmd @@ -1354,14 +1341,6 @@ pGovernanceActionCmd envCli = <*> pGovernanceActionId <*> optional pGovernanceActionQueryResultOut - pActionSubmit :: Parser GovernanceActionCmd - pActionSubmit = - GovernanceActionSubmit - <$> pSocketPath envCli - <*> pNetworkId envCli - <*> pActionFileIn - <*> optional pGovernanceActionReceiptOut - pGovernanceActionId :: Parser GovernanceActionId pGovernanceActionId = fmap (const GovernanceActionId) $ @@ -1371,15 +1350,6 @@ pGovernanceActionCmd envCli = , Opt.help "The governance action id." ] - pGovernanceActionReceiptOut :: Parser (File GovernanceActionReceipt Out) - pGovernanceActionReceiptOut = - fmap File $ Opt.strOption $ mconcat - [ Opt.long "out-file" - , Opt.metavar "FILE" - , Opt.help "Output filepath of the governance action receipt." - , Opt.completer (Opt.bashCompleter "file") - ] - pGovernanceActionQueryResultOut :: Parser (File GovernanceActionQueryResult Out) pGovernanceActionQueryResultOut = fmap File $ Opt.strOption $ mconcat @@ -1473,7 +1443,7 @@ pGovernanceCmd envCli = pActionCmd = GovernanceActionCmd <$> pGovernanceActionCmd envCli pVoteCmd :: Parser GovernanceCmd - pVoteCmd = GovernanceVoteCmd <$> pGovernanceVoteCmd envCli + pVoteCmd = GovernanceVoteCmd <$> pGovernanceVoteCmd pUpdateProposal :: Parser GovernanceCmd pUpdateProposal = GovernanceUpdateProposal 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 1536cd67cb..43fc62eeb1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -81,7 +81,6 @@ Usage: cardano-cli governance action | create-info | view | query - | submit ) Commands related to governance actions @@ -186,14 +185,7 @@ Usage: cardano-cli governance action query --socket-path SOCKET_PATH Query an on-chain action -Usage: cardano-cli governance action submit --socket-path SOCKET_PATH - (--mainnet | --testnet-magic NATURAL) - --action-file FILE - [--out-file FILE] - - Submit an action - -Usage: cardano-cli governance vote (create | view | submit) +Usage: cardano-cli governance vote (create | view) Commands related to governance votes @@ -208,12 +200,6 @@ Usage: cardano-cli governance vote view --vote-file FILE View a vote -Usage: cardano-cli governance vote submit --socket-path SOCKET_PATH - (--mainnet | --testnet-magic NATURAL) - --vote-file FILE - - Submit a vote - Usage: cardano-cli governance create-update-proposal --out-file FILE --epoch EPOCH (--genesis-verification-key-file FILE) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_action.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_action.cli index 9efdfa11d8..df5cf30610 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_action.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_action.cli @@ -8,7 +8,6 @@ Usage: cardano-cli governance action | create-info | view | query - | submit ) Commands related to governance actions @@ -31,4 +30,3 @@ Available commands: create-info Create an info action view View an action query Query an on-chain action - submit Submit an action diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_action_submit.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_action_submit.cli deleted file mode 100644 index 66e667ad84..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_action_submit.cli +++ /dev/null @@ -1,20 +0,0 @@ -Usage: cardano-cli governance action submit --socket-path SOCKET_PATH - (--mainnet | --testnet-magic NATURAL) - --action-file FILE - [--out-file FILE] - - Submit an action - -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. - --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 - --action-file FILE Input filepath of the governance action. - --out-file FILE Output filepath of the governance action receipt. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_vote.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_vote.cli index 13538eee3d..2f6597b112 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_vote.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_vote.cli @@ -1,4 +1,4 @@ -Usage: cardano-cli governance vote (create | view | submit) +Usage: cardano-cli governance vote (create | view) Commands related to governance votes @@ -8,4 +8,3 @@ Available options: Available commands: create Create a vote view View a vote - submit Submit a vote diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_vote_submit.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_vote_submit.cli deleted file mode 100644 index 93eb9c3c57..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_vote_submit.cli +++ /dev/null @@ -1,18 +0,0 @@ -Usage: cardano-cli governance vote submit --socket-path SOCKET_PATH - (--mainnet | --testnet-magic NATURAL) - --vote-file FILE - - Submit a vote - -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. - --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 - --vote-file FILE Input filepath of the governance vote. - -h,--help Show this help text