diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index fe185ee650..5ee3db15ca 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -3571,29 +3571,21 @@ pAnchorDataHash = pMustCheckHash :: String -> String -> String -> String -> Parser (MustCheckHash anchorData) pMustCheckHash flagSuffix' dataName' hashParamName' urlParamName' = - asum - [ Opt.flag' CheckHash $ - mconcat - [ Opt.long ("check-" ++ flagSuffix') - , Opt.help - ( "Check the " - ++ dataName' - ++ " hash (from " - ++ hashParamName' - ++ ") by downloading " - ++ dataName' - ++ " data (from " - ++ urlParamName' - ++ ")." - ) - ] - , Opt.flag' TrustHash $ - mconcat - [ Opt.long ("trust-" ++ flagSuffix') - , Opt.help - ("Do not check the " ++ dataName' ++ " hash (from " ++ hashParamName' ++ ") and trust it is correct.") - ] - ] + Opt.flag TrustHash CheckHash $ + mconcat + [ Opt.long ("check-" ++ flagSuffix') + , Opt.help + ( "Check the " + ++ dataName' + ++ " hash (from " + ++ hashParamName' + ++ ") by downloading " + ++ dataName' + ++ " data (from " + ++ urlParamName' + ++ ")." + ) + ] pPotentiallyCheckedAnchorData :: Parser (MustCheckHash anchorDataType) 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 6c6b1528d1..6771622683 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 @@ -161,7 +161,6 @@ hprop_golden_conway_governance_action_view_constitution_json = , proposalHash , "--anchor-url" , "proposal-dummy-url" - , "--trust-anchor-data" , "--governance-action-deposit" , "10" , "--deposit-return-stake-verification-key-file" @@ -172,7 +171,6 @@ hprop_golden_conway_governance_action_view_constitution_json = , "http://my-great-constitution.rocks" , "--constitution-hash" , constitutionHash - , "--trust-constitution-hash" ] goldenActionViewFile <- @@ -469,7 +467,6 @@ hprop_golden_conway_governance_action_create_protocol_parameters_update_partial_ , "--anchor-data-hash" , "c7ddb5b493faa4d3d2d679847740bdce0c5d358d56f9b1470ca67f5652a02745" , "--mainnet" - , "--trust-anchor-data" , "--deposit-return-stake-verification-key-file" , stakeAddressVKeyFile , "--governance-action-deposit" diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs index 9d6ac2bd84..5131cfddea 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs @@ -193,7 +193,6 @@ hprop_golden_governance_UpdateCommittee = , "http://dummy" , "--anchor-data-hash" , proposalHash - , "--trust-anchor-data" , "--add-cc-cold-verification-key-file" , coldCCVkey1 , "--epoch" diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs index 20b26b7355..41e9482feb 100644 --- a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs +++ b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs @@ -217,7 +217,6 @@ hprop_golden_governance_drep_registration_certificate_vkey_file = propertyOnce . , "--key-reg-deposit-amt", "0" , "--drep-metadata-url", "dummy-url" , "--drep-metadata-hash", "52e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" - , "--trust-drep-metadata-hash" , "--out-file", outFile ] @@ -237,7 +236,6 @@ hprop_golden_governance_drep_registration_certificate_id_hex = propertyOnce . H. , "--key-reg-deposit-amt", "0" , "--drep-metadata-url", "dummy-url" , "--drep-metadata-hash", "52e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" - , "--trust-drep-metadata-hash" , "--out-file", outFile ] @@ -257,7 +255,6 @@ hprop_golden_governance_drep_registration_certificate_id_bech32 = propertyOnce . , "--key-reg-deposit-amt", "0" , "--drep-metadata-url", "dummy-url" , "--drep-metadata-hash", "52e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" - , "--trust-drep-metadata-hash" , "--out-file", outFile ] @@ -276,7 +273,6 @@ hprop_golden_governance_drep_registration_certificate_script_hash = propertyOnce , "--key-reg-deposit-amt", "0" , "--drep-metadata-url", "dummy-url" , "--drep-metadata-hash", "52e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" - , "--trust-drep-metadata-hash" , "--out-file", outFile ] @@ -296,7 +292,6 @@ hprop_golden_governance_drep_update_certificate_vkey_file = propertyOnce . H.mod , "--drep-verification-key-file", drepVKeyFile , "--drep-metadata-url", "dummy-url" , "--drep-metadata-hash", "52e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" - , "--trust-drep-metadata-hash" , "--out-file", outFile ] @@ -314,9 +309,6 @@ hprop_golden_governance_drep_update_certificate_script_hash = propertyOnce . H.m , "--drep-script-hash", "8f33600845940d65bdbc7ea7a247a7997aa8558649128fa82c4c0468" , "--drep-metadata-url", "https://raw.githubusercontent.com/cardano-foundation/CIPs/master/CIP-0119/examples/drep.jsonld" , "--drep-metadata-hash", "fecc1773db89b45557d82e07719c275f6877a6cadfd2469f4dc5a7df5b38b4a4" - , "--trust-drep-metadata-hash" -- This is to avoid connecting to GitHub during tests, but it is actually a - -- really good test to run it with "--check-drep-metadata-hash" here, - -- because the URL and hash are correct. , "--out-file", outFile ] 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 c76af737de..e21fb59299 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -6480,14 +6480,10 @@ Usage: cardano-cli conway governance action create-constitution --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --constitution-url TEXT --constitution-hash HASH - ( --check-constitution-hash - | --trust-constitution-hash - ) + [--check-constitution-hash] [--constitution-script-hash HASH] --out-file FILEPATH @@ -6506,9 +6502,7 @@ Usage: cardano-cli conway governance action update-committee ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [ --remove-cc-cold-verification-key STRING | --remove-cc-cold-verification-key-file FILEPATH | --remove-cc-cold-verification-key-hash STRING @@ -6538,9 +6532,7 @@ Usage: cardano-cli conway governance action create-info (--mainnet | --testnet) ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --out-file FILEPATH Create an info action. @@ -6558,9 +6550,7 @@ Usage: cardano-cli conway governance action create-no-confidence ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] --out-file FILEPATH @@ -6580,9 +6570,7 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] [--constitution-script-hash HASH] @@ -6647,9 +6635,7 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] ( ( --funds-receiving-stake-verification-key STRING | --funds-receiving-stake-verification-key-file FILEPATH @@ -6678,9 +6664,7 @@ Usage: cardano-cli conway governance action create-hardfork --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --protocol-major-version MAJOR --protocol-minor-version MINOR --out-file FILEPATH @@ -6787,9 +6771,7 @@ Usage: cardano-cli conway governance drep registration-certificate --key-reg-deposit-amt NATURAL [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a registration certificate. @@ -6813,9 +6795,7 @@ Usage: cardano-cli conway governance drep update-certificate ) [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a DRep update certificate. @@ -8486,14 +8466,10 @@ Usage: cardano-cli latest governance action create-constitution --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --constitution-url TEXT --constitution-hash HASH - ( --check-constitution-hash - | --trust-constitution-hash - ) + [--check-constitution-hash] [--constitution-script-hash HASH] --out-file FILEPATH @@ -8512,9 +8488,7 @@ Usage: cardano-cli latest governance action update-committee ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [ --remove-cc-cold-verification-key STRING | --remove-cc-cold-verification-key-file FILEPATH | --remove-cc-cold-verification-key-hash STRING @@ -8544,9 +8518,7 @@ Usage: cardano-cli latest governance action create-info (--mainnet | --testnet) ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --out-file FILEPATH Create an info action. @@ -8564,9 +8536,7 @@ Usage: cardano-cli latest governance action create-no-confidence ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] --out-file FILEPATH @@ -8586,9 +8556,7 @@ Usage: cardano-cli latest governance action create-protocol-parameters-update ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] [--constitution-script-hash HASH] @@ -8653,9 +8621,7 @@ Usage: cardano-cli latest governance action create-treasury-withdrawal ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] ( ( --funds-receiving-stake-verification-key STRING | --funds-receiving-stake-verification-key-file FILEPATH @@ -8684,9 +8650,7 @@ Usage: cardano-cli latest governance action create-hardfork --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --protocol-major-version MAJOR --protocol-minor-version MINOR --out-file FILEPATH @@ -8793,9 +8757,7 @@ Usage: cardano-cli latest governance drep registration-certificate --key-reg-deposit-amt NATURAL [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a registration certificate. @@ -8819,9 +8781,7 @@ Usage: cardano-cli latest governance drep update-certificate ) [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a DRep update certificate. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli index a2d2eafec3..28c12be91f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli @@ -13,14 +13,10 @@ Usage: cardano-cli conway governance action create-constitution --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --constitution-url TEXT --constitution-hash HASH - ( --check-constitution-hash - | --trust-constitution-hash - ) + [--check-constitution-hash] [--constitution-script-hash HASH] --out-file FILEPATH @@ -50,8 +46,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --constitution-url TEXT Constitution URL. --constitution-hash HASH Hash of the constitution data (obtain it with "cardano-cli hash anchor-data ..."). @@ -59,9 +53,6 @@ Available options: Check the constitution hash (from --constitution-hash) by downloading constitution data (from --constitution-url). - --trust-constitution-hash - Do not check the constitution hash (from - --constitution-hash) and trust it is correct. --constitution-script-hash HASH Constitution script hash (hex-encoded). Obtain it with "cardano-cli hash script ...". diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-hardfork.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-hardfork.cli index 5fe5832d20..5b8c15b328 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-hardfork.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-hardfork.cli @@ -13,9 +13,7 @@ Usage: cardano-cli conway governance action create-hardfork --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --protocol-major-version MAJOR --protocol-minor-version MINOR --out-file FILEPATH @@ -46,8 +44,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --protocol-major-version MAJOR Specify the major protocol version to fork into. An increase indicates a hard fork. It must be the next diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli index 21a8c4bb73..ff3fe368df 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli @@ -8,9 +8,7 @@ Usage: cardano-cli conway governance action create-info (--mainnet | --testnet) ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --out-file FILEPATH Create an info action. @@ -35,8 +33,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --out-file FILEPATH Path to action file to be used later on with build or build-raw -h,--help Show this help text 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 85d1fed3b6..ca82538a53 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 @@ -11,9 +11,7 @@ Usage: cardano-cli conway governance action create-no-confidence ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] --out-file FILEPATH @@ -40,8 +38,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --prev-governance-action-tx-id TXID Txid of the previous governance action. --prev-governance-action-index WORD16 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli index 5adbf0da1c..50ffda555d 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli @@ -11,9 +11,7 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] [--constitution-script-hash HASH] @@ -85,8 +83,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --prev-governance-action-tx-id TXID Txid of the previous governance action. --prev-governance-action-index WORD16 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli index 14f60a6b2a..9f70b8439c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli @@ -11,9 +11,7 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] ( ( --funds-receiving-stake-verification-key STRING | --funds-receiving-stake-verification-key-file FILEPATH @@ -47,8 +45,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --funds-receiving-stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --funds-receiving-stake-verification-key-file FILEPATH diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli index b1d5ecf41f..5a7581c953 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli @@ -11,9 +11,7 @@ Usage: cardano-cli conway governance action update-committee ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [ --remove-cc-cold-verification-key STRING | --remove-cc-cold-verification-key-file FILEPATH | --remove-cc-cold-verification-key-hash STRING @@ -53,8 +51,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --remove-cc-cold-verification-key STRING Constitutional Committee cold key (hex-encoded). --remove-cc-cold-verification-key-file FILEPATH diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli index 9a471f2f09..8079232b95 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli @@ -7,9 +7,7 @@ Usage: cardano-cli conway governance drep registration-certificate --key-reg-deposit-amt NATURAL [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a registration certificate. @@ -32,8 +30,5 @@ Available options: Check the DRep metadata hash (from --drep-metadata-hash) by downloading DRep metadata data (from --drep-metadata-url). - --trust-drep-metadata-hash - Do not check the DRep metadata hash (from - --drep-metadata-hash) and trust it is correct. --out-file FILEPATH The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_update-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_update-certificate.cli index 015255cdf1..9d21c3a821 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_update-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_update-certificate.cli @@ -6,9 +6,7 @@ Usage: cardano-cli conway governance drep update-certificate ) [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a DRep update certificate. @@ -29,8 +27,5 @@ Available options: Check the DRep metadata hash (from --drep-metadata-hash) by downloading DRep metadata data (from --drep-metadata-url). - --trust-drep-metadata-hash - Do not check the DRep metadata hash (from - --drep-metadata-hash) and trust it is correct. --out-file FILEPATH The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-constitution.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-constitution.cli index fba39f220b..5af0c61746 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-constitution.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-constitution.cli @@ -13,14 +13,10 @@ Usage: cardano-cli latest governance action create-constitution --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --constitution-url TEXT --constitution-hash HASH - ( --check-constitution-hash - | --trust-constitution-hash - ) + [--check-constitution-hash] [--constitution-script-hash HASH] --out-file FILEPATH @@ -50,8 +46,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --constitution-url TEXT Constitution URL. --constitution-hash HASH Hash of the constitution data (obtain it with "cardano-cli hash anchor-data ..."). @@ -59,9 +53,6 @@ Available options: Check the constitution hash (from --constitution-hash) by downloading constitution data (from --constitution-url). - --trust-constitution-hash - Do not check the constitution hash (from - --constitution-hash) and trust it is correct. --constitution-script-hash HASH Constitution script hash (hex-encoded). Obtain it with "cardano-cli hash script ...". diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-hardfork.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-hardfork.cli index 73ed48b6ca..af1437b43d 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-hardfork.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-hardfork.cli @@ -13,9 +13,7 @@ Usage: cardano-cli latest governance action create-hardfork --prev-governance-action-index WORD16] --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --protocol-major-version MAJOR --protocol-minor-version MINOR --out-file FILEPATH @@ -46,8 +44,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --protocol-major-version MAJOR Specify the major protocol version to fork into. An increase indicates a hard fork. It must be the next diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-info.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-info.cli index 91a4710282..d03ecd2bb1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-info.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-info.cli @@ -8,9 +8,7 @@ Usage: cardano-cli latest governance action create-info (--mainnet | --testnet) ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] --out-file FILEPATH Create an info action. @@ -35,8 +33,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --out-file FILEPATH Path to action file to be used later on with build or build-raw -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-no-confidence.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-no-confidence.cli index c172eb2a48..6889c11233 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-no-confidence.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-no-confidence.cli @@ -11,9 +11,7 @@ Usage: cardano-cli latest governance action create-no-confidence ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] --out-file FILEPATH @@ -40,8 +38,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --prev-governance-action-tx-id TXID Txid of the previous governance action. --prev-governance-action-index WORD16 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli index a29524ab9b..be143f766e 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-protocol-parameters-update.cli @@ -11,9 +11,7 @@ Usage: cardano-cli latest governance action create-protocol-parameters-update ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD16] [--constitution-script-hash HASH] @@ -85,8 +83,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --prev-governance-action-tx-id TXID Txid of the previous governance action. --prev-governance-action-index WORD16 diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-treasury-withdrawal.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-treasury-withdrawal.cli index b6cb909c90..4d853f4282 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-treasury-withdrawal.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_create-treasury-withdrawal.cli @@ -11,9 +11,7 @@ Usage: cardano-cli latest governance action create-treasury-withdrawal ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] ( ( --funds-receiving-stake-verification-key STRING | --funds-receiving-stake-verification-key-file FILEPATH @@ -47,8 +45,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --funds-receiving-stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --funds-receiving-stake-verification-key-file FILEPATH diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_update-committee.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_update-committee.cli index d473190a18..e0fdadf47f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_update-committee.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_action_update-committee.cli @@ -11,9 +11,7 @@ Usage: cardano-cli latest governance action update-committee ) --anchor-url TEXT --anchor-data-hash HASH - ( --check-anchor-data - | --trust-anchor-data - ) + [--check-anchor-data] [ --remove-cc-cold-verification-key STRING | --remove-cc-cold-verification-key-file FILEPATH | --remove-cc-cold-verification-key-hash STRING @@ -53,8 +51,6 @@ Available options: "cardano-cli hash anchor-data ...") --check-anchor-data Check the proposal hash (from --anchor-data-hash) by downloading proposal data (from --anchor-url). - --trust-anchor-data Do not check the proposal hash (from - --anchor-data-hash) and trust it is correct. --remove-cc-cold-verification-key STRING Constitutional Committee cold key (hex-encoded). --remove-cc-cold-verification-key-file FILEPATH diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli index a8a230c2ad..b8609b35b3 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli @@ -7,9 +7,7 @@ Usage: cardano-cli latest governance drep registration-certificate --key-reg-deposit-amt NATURAL [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a registration certificate. @@ -32,8 +30,5 @@ Available options: Check the DRep metadata hash (from --drep-metadata-hash) by downloading DRep metadata data (from --drep-metadata-url). - --trust-drep-metadata-hash - Do not check the DRep metadata hash (from - --drep-metadata-hash) and trust it is correct. --out-file FILEPATH The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_update-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_update-certificate.cli index 83b8483239..517f1f1be2 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_update-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_update-certificate.cli @@ -6,9 +6,7 @@ Usage: cardano-cli latest governance drep update-certificate ) [--drep-metadata-url TEXT --drep-metadata-hash HASH - ( --check-drep-metadata-hash - | --trust-drep-metadata-hash - )] + [--check-drep-metadata-hash]] --out-file FILEPATH Create a DRep update certificate. @@ -29,8 +27,5 @@ Available options: Check the DRep metadata hash (from --drep-metadata-hash) by downloading DRep metadata data (from --drep-metadata-url). - --trust-drep-metadata-hash - Do not check the DRep metadata hash (from - --drep-metadata-hash) and trust it is correct. --out-file FILEPATH The output file. -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs index 0833c1717c..4d94152a6f 100644 --- a/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs +++ b/cardano-cli/test/cardano-cli-test/Test/Cli/Governance/DRep.hs @@ -48,7 +48,6 @@ hprop_governance_drep_registration_certificate_script_hash = , metadataUrl , "--drep-metadata-hash" , "52e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" - , "--trust-drep-metadata-hash" , "--out-file" , outFile ] @@ -89,7 +88,6 @@ hprop_governance_drep_update_certificate_vkey_file = , metadataUrl , "--drep-metadata-hash" , "52e69500a92d80f2126c836a4903dc582006709f004cf7a28ed648f732dff8d2" - , "--trust-drep-metadata-hash" , "--out-file" , outFile ]