diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs index 33db3ee1cd..a959ce71ec 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Vote.hs @@ -30,8 +30,8 @@ data GovernanceVoteCreateCmdArgs era , voteChoice :: Vote , governanceAction :: (TxId, Word32) , votingStakeCredentialSource :: AnyVotingStakeVerificationKeyOrHashOrFile - , outFile :: VoteFile Out , mAnchor :: Maybe (VoteUrl, VoteHashSource) + , outFile :: VoteFile Out } data GovernanceVoteViewCmdArgs era diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs index c22588ec66..c9203f772d 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs @@ -46,8 +46,8 @@ pGovernanceVoteCreateCmdArgs cOnwards = <$> pVoteChoice <*> pGovernanceActionId <*> pAnyVotingStakeVerificationKeyOrHashOrFile - <*> pFileOutDirection "out-file" "Output filepath of the vote." <*> optional pVoteAnchor + <*> pFileOutDirection "out-file" "Output filepath of the vote." pAnyVotingStakeVerificationKeyOrHashOrFile :: Parser AnyVotingStakeVerificationKeyOrHashOrFile pAnyVotingStakeVerificationKeyOrHashOrFile = diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs index ca190934fa..3580d4e3bd 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs @@ -42,7 +42,7 @@ runGovernanceVoteCmds = \case runGovernanceVoteCreateCmd :: () => Cmd.GovernanceVoteCreateCmdArgs era -> ExceptT GovernanceVoteCmdError IO () -runGovernanceVoteCreateCmd (Cmd.GovernanceVoteCreateCmdArgs cOnwards voteChoice (govActionTxId, govActionIndex) voteStakeCred oFp mAnchor) = do +runGovernanceVoteCreateCmd (Cmd.GovernanceVoteCreateCmdArgs cOnwards voteChoice (govActionTxId, govActionIndex) voteStakeCred mAnchor oFp) = do let sbe = conwayEraOnwardsToShelleyBasedEra cOnwards -- TODO: Conway era - update vote creation related function to take ConwayEraOnwards voteProcedure <- case mAnchor of Nothing -> pure $ createVotingProcedure cOnwards voteChoice Nothing 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 773c2dbdb3..be9e958486 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -6362,12 +6362,12 @@ Usage: cardano-cli conway governance vote create (--yes | --no | --abstain) | --cc-hot-verification-key-file FILE | --cc-hot-key-hash STRING ) - --out-file FILE [--vote-anchor-url TEXT ( --vote-anchor-metadata TEXT | --vote-anchor-metadata-file FILE | --vote-anchor-metadata-hash HASH )] + --out-file FILE Vote creation. 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 5df3037eb2..01fa169852 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 @@ -11,12 +11,12 @@ Usage: cardano-cli conway governance vote create (--yes | --no | --abstain) | --cc-hot-verification-key-file FILE | --cc-hot-key-hash STRING ) - --out-file FILE [--vote-anchor-url TEXT ( --vote-anchor-metadata TEXT | --vote-anchor-metadata-file FILE | --vote-anchor-metadata-hash HASH )] + --out-file FILE Vote creation. @@ -45,7 +45,6 @@ Available options: --cc-hot-verification-key-file FILE Filepath of the Consitutional Committee hot key. --cc-hot-key-hash STRING Constitutional Committee key hash (hex-encoded). - --out-file FILE Output filepath of the vote. --vote-anchor-url TEXT Vote anchor URL --vote-anchor-metadata TEXT Vote anchor contents as UTF-8 encoded text. @@ -53,4 +52,5 @@ Available options: Vote anchor contents as a text file. --vote-anchor-metadata-hash HASH Hash of the vote anchor data. + --out-file FILE Output filepath of the vote. -h,--help Show this help text