Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disambiguate treasury withdrawal flags #378

Merged
merged 2 commits into from
Oct 19, 2023
Merged

Disambiguate treasury withdrawal flags #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b96ece
Disambiguate treasury withdrawals
carlhammann Oct 17, 2023
76e0164
Delete unused golden files
carlhammann Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,10 @@ pGovernanceActionTreasuryWithdrawalCmd era = do
Cmd.GovernanceActionTreasuryWithdrawalCmdArgs eon
<$> pNetwork
<*> pGovActionDeposit
<*> pAnyStakeIdentifier Nothing
<*> pAnyStakeIdentifier (Just "deposit-return")
<*> pProposalUrl
<*> pProposalHashSource
<*> many ((,) <$> pAnyStakeIdentifier Nothing <*> pTransferAmt) -- TODO we should likely pass a prefix here, becaus pAnyStakeIdentiefier is used twice
<*> many ((,) <$> pAnyStakeIdentifier (Just "funds-receiving") <*> pTransferAmt)
<*> pFileOutDirection "out-file" "Output filepath of the treasury withdrawal."
)
$ Opt.progDesc "Create a treasury withdrawal."
Expand Down
24 changes: 12 additions & 12 deletions cardano-cli/test/cardano-cli-golden/files/golden/help.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6213,25 +6213,25 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal
| --testnet
)
--governance-action-deposit NATURAL
( --stake-pool-verification-key STRING
| --cold-verification-key-file FILE
| --stake-pool-id STAKE_POOL_ID
| --stake-verification-key STRING
| --stake-verification-key-file FILE
| --stake-key-hash HASH
( --deposit-return-stake-pool-verification-key STRING
| --deposit-return-cold-verification-key-file FILE
| --deposit-return-stake-pool-id STAKE_POOL_ID
| --deposit-return-stake-verification-key STRING
| --deposit-return-stake-verification-key-file FILE
| --deposit-return-stake-key-hash HASH
)
--proposal-anchor-url TEXT
( --proposal-anchor-metadata TEXT
| --proposal-anchor-metadata-file FILE
| --proposal-anchor-metadata-hash HASH
)
[
( --stake-pool-verification-key STRING
| --cold-verification-key-file FILE
| --stake-pool-id STAKE_POOL_ID
| --stake-verification-key STRING
| --stake-verification-key-file FILE
| --stake-key-hash HASH
( --funds-receiving-stake-pool-verification-key STRING
| --funds-receiving-cold-verification-key-file FILE
| --funds-receiving-stake-pool-id STAKE_POOL_ID
| --funds-receiving-stake-verification-key STRING
| --funds-receiving-stake-verification-key-file FILE
| --funds-receiving-stake-key-hash HASH
)
--transfer LOVELACE]
--out-file FILE
Expand Down
34 changes: 0 additions & 34 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_query_constitution-hash.cli
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_query_constitution-hash.cli
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_query_constitution-hash.cli
View file
Open in desktop

This file was deleted.

50 changes: 26 additions & 24 deletions ...dano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal
| --testnet
)
--governance-action-deposit NATURAL
( --stake-pool-verification-key STRING
| --cold-verification-key-file FILE
| --stake-pool-id STAKE_POOL_ID
| --stake-verification-key STRING
| --stake-verification-key-file FILE
| --stake-key-hash HASH
( --deposit-return-stake-pool-verification-key STRING
| --deposit-return-cold-verification-key-file FILE
| --deposit-return-stake-pool-id STAKE_POOL_ID
| --deposit-return-stake-verification-key STRING
| --deposit-return-stake-verification-key-file FILE
| --deposit-return-stake-key-hash HASH
)
--proposal-anchor-url TEXT
( --proposal-anchor-metadata TEXT
| --proposal-anchor-metadata-file FILE
| --proposal-anchor-metadata-hash HASH
)
[
( --stake-pool-verification-key STRING
| --cold-verification-key-file FILE
| --stake-pool-id STAKE_POOL_ID
| --stake-verification-key STRING
| --stake-verification-key-file FILE
| --stake-key-hash HASH
( --funds-receiving-stake-pool-verification-key STRING
| --funds-receiving-cold-verification-key-file FILE
| --funds-receiving-stake-pool-id STAKE_POOL_ID
| --funds-receiving-stake-verification-key STRING
| --funds-receiving-stake-verification-key-file FILE
| --funds-receiving-stake-key-hash HASH
)
--transfer LOVELACE]
--out-file FILE
Expand All @@ -33,19 +33,20 @@ Available options:
--testnet Use the testnet magic id.
--governance-action-deposit NATURAL
Deposit required to submit a governance action.
--stake-pool-verification-key STRING
--deposit-return-stake-pool-verification-key STRING
Stake pool verification key (Bech32 or hex-encoded).
--cold-verification-key-file FILE
--deposit-return-cold-verification-key-file FILE
Filepath of the stake pool verification key.
--stake-pool-id STAKE_POOL_ID
--deposit-return-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.
--stake-verification-key STRING
--deposit-return-stake-verification-key STRING
Stake verification key (Bech32 or hex-encoded).
--stake-verification-key-file FILE
--deposit-return-stake-verification-key-file FILE
Filepath of the staking verification key.
--stake-key-hash HASH Stake verification key hash (hex-encoded).
--deposit-return-stake-key-hash HASH
Stake verification key hash (hex-encoded).
--proposal-anchor-url TEXT
Proposal anchor URL
--proposal-anchor-metadata TEXT
Expand All @@ -54,19 +55,20 @@ Available options:
Proposal anchor contents as a text file.
--proposal-anchor-metadata-hash HASH
Proposal anchor data hash.
--stake-pool-verification-key STRING
--funds-receiving-stake-pool-verification-key STRING
Stake pool verification key (Bech32 or hex-encoded).
--cold-verification-key-file FILE
--funds-receiving-cold-verification-key-file FILE
Filepath of the stake pool verification key.
--stake-pool-id STAKE_POOL_ID
--funds-receiving-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.
--stake-verification-key STRING
--funds-receiving-stake-verification-key STRING
Stake verification key (Bech32 or hex-encoded).
--stake-verification-key-file FILE
--funds-receiving-stake-verification-key-file FILE
Filepath of the staking verification key.
--stake-key-hash HASH Stake verification key hash (hex-encoded).
--funds-receiving-stake-key-hash HASH
Stake verification key hash (hex-encoded).
--transfer LOVELACE The amount to transfer.
--out-file FILE Output filepath of the treasury withdrawal.
-h,--help Show this help text
34 changes: 0 additions & 34 deletions cardano-cli/test/cardano-cli-golden/files/golden/help/conway_query_constitution-hash.cli
View file
Open in desktop

This file was deleted.

Loading