Merge pull request #511 from input-output-hk/mkoura/prev-governance-a…

…ction-consistency-fix Unify previous governance action parameters across actions
IntersectMBO · Dec 7, 2023 · b0cf3f0 · b0cf3f0
2 parents e62ea2f + 848d011
commit b0cf3f0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 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
@@ -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
@@ -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
@@ -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/...st/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli b/...st/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