From 848d011d3d3b8a1b31031cc880b4f659cb66cd9f Mon Sep 17 00:00:00 2001 From: Martin Kourim Date: Wed, 6 Dec 2023 22:20:16 +0100 Subject: [PATCH] Unify previous governance action argument across actions --- .../CLI/EraBased/Options/Governance/Actions.hs | 4 ++-- .../Test/Golden/Governance/Action.hs | 4 ++-- .../test/cardano-cli-golden/files/golden/help.cli | 4 ++-- ...nway_governance_action_create-no-confidence.cli | 14 ++++++-------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs index c1e57fe831..a93e701e08 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs @@ -146,8 +146,8 @@ pGovernanceActionNoConfidenceCmd era = do <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") <*> pAnchorUrl <*> pAnchorDataHash - <*> pTxId "governance-action-tx-id" "Previous txid of `NoConfidence` or `NewCommittee` governance action." - <*> pWord32 "governance-action-index" "Previous tx's governance action index of `NoConfidence` or `NewCommittee` governance action." + <*> pTxId "prev-governance-action-tx-id" "Txid of the previous governance action." + <*> pWord32 "prev-governance-action-index" "Action index of the previous governance action." <*> pFileOutDirection "out-file" "Output filepath of the no confidence proposal." ) $ Opt.progDesc "Create a no confidence proposal." diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs index cc33d33550..9ad947eb3a 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Action.hs @@ -160,8 +160,8 @@ hprop_golden_governanceActionCreateNoConfidence = , "--deposit-return-stake-verification-key-file", stakeAddressVKeyFile , "--anchor-url", "proposal-dummy-url" , "--anchor-data-hash", "c7ddb5b493faa4d3d2d679847740bdce0c5d358d56f9b1470ca67f5652a02745" - , "--governance-action-index", "5" - , "--governance-action-tx-id", "b1015258a99351c143a7a40b7b58f033ace10e3cc09c67780ed5b2b0992aa60a" + , "--prev-governance-action-index", "5" + , "--prev-governance-action-tx-id", "b1015258a99351c143a7a40b7b58f033ace10e3cc09c67780ed5b2b0992aa60a" , "--out-file", actionFile ] 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 931800edfe..225d1d3e0e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -6164,8 +6164,8 @@ Usage: cardano-cli conway governance action create-no-confidence ) --anchor-url TEXT --anchor-data-hash HASH - --governance-action-tx-id TXID - --governance-action-index WORD32 + --prev-governance-action-tx-id TXID + --prev-governance-action-index WORD32 --out-file FILE Create a no confidence proposal. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli index 8e14a96afb..111c30641c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli @@ -9,8 +9,8 @@ Usage: cardano-cli conway governance action create-no-confidence ) --anchor-url TEXT --anchor-data-hash HASH - --governance-action-tx-id TXID - --governance-action-index WORD32 + --prev-governance-action-tx-id TXID + --prev-governance-action-index WORD32 --out-file FILE Create a no confidence proposal. @@ -29,11 +29,9 @@ Available options: --anchor-url TEXT Anchor URL --anchor-data-hash HASH Proposal anchor data hash (obtain it with "cardano-cli conway governance hash ...") - --governance-action-tx-id TXID - Previous txid of `NoConfidence` or `NewCommittee` - governance action. - --governance-action-index WORD32 - Previous tx's governance action index of - `NoConfidence` or `NewCommittee` governance action. + --prev-governance-action-tx-id TXID + Txid of the previous governance action. + --prev-governance-action-index WORD32 + Action index of the previous governance action. --out-file FILE Output filepath of the no confidence proposal. -h,--help Show this help text