From 6e638600a0b59ee620f3da2999e1fb829ff4bbbb Mon Sep 17 00:00:00 2001 From: Carlos LopezDeLara Date: Thu, 2 May 2024 23:59:00 -0600 Subject: [PATCH] Update description field in governance action (proposal) files + update golden files. --- .../Cardano/CLI/EraBased/Run/Governance/Actions.hs | 14 +++++++------- ...col-parameters-update-partial-costmodels.action | 2 +- ...conway-create-protocol-parameters-update.action | 2 +- ...te-constitution-for-stake-address.action.golden | 2 +- .../action/hardfork/conway-create-hardfork.action | 2 +- .../committee/update-committee-answer.json | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs index 43797c7603..01f73c80a5 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs @@ -103,7 +103,7 @@ runGovernanceActionInfoCmd firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon - $ writeFileTextEnvelope outFile Nothing proposalProcedure + $ writeFileTextEnvelope outFile (Just "Info proposal") proposalProcedure -- TODO: Conway era - update with new ledger types from cardano-ledger-conway-1.7.0.0 runGovernanceActionCreateNoConfidenceCmd :: () @@ -142,7 +142,7 @@ runGovernanceActionCreateNoConfidenceCmd firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon - $ writeFileTextEnvelope outFile Nothing proposalProcedure + $ writeFileTextEnvelope outFile (Just "Motion of no confidence proposal") proposalProcedure runGovernanceActionCreateConstitutionCmd :: () => GovernanceActionCreateConstitutionCmdArgs era @@ -187,7 +187,7 @@ runGovernanceActionCreateConstitutionCmd firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon - $ writeFileTextEnvelope outFile Nothing proposalProcedure + $ writeFileTextEnvelope outFile (Just "Update to the Constitution or policy proposal") proposalProcedure -- TODO: Conway era - After ledger bump update this function -- with the new ledger types @@ -241,7 +241,7 @@ runGovernanceActionUpdateCommitteeCmd firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon - $ writeFileTextEnvelope outFile Nothing proposal + $ writeFileTextEnvelope outFile (Just "New constitutional committee and/or threshold and/or terms proposal") proposal runGovernanceActionCreateProtocolParametersUpdateCmd :: () => Cmd.GovernanceActionProtocolParametersUpdateCmdArgs era @@ -303,7 +303,7 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints conwayOnwards - $ writeFileTextEnvelope oFp Nothing proposalProcedure + $ writeFileTextEnvelope oFp (Just "Update protocol parameters proposal") proposalProcedure ) sbe where @@ -378,7 +378,7 @@ runGovernanceActionTreasuryWithdrawalCmd firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon - $ writeFileTextEnvelope outFile Nothing proposal + $ writeFileTextEnvelope outFile (Just "Treasury withdrawal proposal") proposal runGovernanceActionHardforkInitCmd :: () => GovernanceActionHardforkInitCmdArgs era @@ -416,4 +416,4 @@ runGovernanceActionHardforkInitCmd firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon - $ writeFileTextEnvelope outFile (Just "Hardfork initiation governance action") proposalProcedure \ No newline at end of file + $ writeFileTextEnvelope outFile (Just "Hardfork initiation proposal") proposalProcedure \ No newline at end of file diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update-partial-costmodels.action b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update-partial-costmodels.action index 7f98fafd03..82228194a6 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update-partial-costmodels.action +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update-partial-costmodels.action @@ -1,5 +1,5 @@ { "type": "Governance proposal", - "description": "", + "description": "Update protocol parameters proposal", "cborHex": "84193039581de18f4a3466a404c11eb410313015b88e447d81b60089e25f611600e6058400f6a112a1019f1a0003236119032c01011903e819023b00011903e8195e7104011903e818201a0001ca761928eb041959d818641959d818641959d818641959d818641959d818641959d81864186418641959d81864194c5118201a0002acfa182019b551041a000363151901ff00011a00015c3518201a000797751936f404021a0002ff941a0006ea7818dc0001011903e8196ff604021a0003bd081a00034ec5183e011a00102e0f19312a011a00032e801901a5011a0002da781903e819cf06011a00013a34182019a8f118201903e818201a00013aac0119e143041903e80a1a00030219189c011a00030219189c011a0003207c1901d9011a000330001901ff0119ccf3182019fd40182019ffd5182019581e18201940b318201a00012adf18201a0002ff941a0006ea7818dc0001011a00010f92192da7000119eabb18201a0002ff941a0006ea7818dc0001011a0002ff941a0006ea7818dc0001011a0011b22c1a0005fdde00021a000c504e197712041a001d6af61a0001425b041a00040c660004001a00014fab18201a0003236119032c010119a0de18201a00033d7618201979f41820197fb8182019a95d1820197df718201995aa18201a0223accc0a1a009063b91903fd0a1a02515e841980b30afff6826b6578616d706c652e636f6d5820c7ddb5b493faa4d3d2d679847740bdce0c5d358d56f9b1470ca67f5652a02745" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action index 3ddffc646a..ab4baae9b1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/conway-create-protocol-parameters-update.action @@ -1,5 +1,5 @@ { "type": "Governance proposal", - "description": "", + "description": "Update protocol parameters proposal", "cborHex": "84193039581de18f4a3466a404c11eb410313015b88e447d81b60089e25f611600e6058400f6a3031904d212a3009f1a000302590001011a00060bc719026d00011a000249f01903e800011a000249f018201a0025cea81971f70419744d186419744d186419744d186419744d186419744d186419744d18641864186419744d18641a000249f018201a000249f018201a000249f018201a000249f01903e800011a000249f018201a000249f01903e800081a000242201a00067e2318760001011a000249f01903e800081a000249f01a0001b79818f7011a000249f0192710011a0002155e19052e011903e81a000249f01903e8011a000249f018201a000249f018201a000249f0182001011a000249f0011a000249f0041a000194af18f8011a000194af18f8011a0002377c190556011a0002bdea1901f1011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000242201a00067e23187600010119f04c192bd200011a000249f018201a000242201a00067e2318760001011a000242201a00067e2318760001011a0025cea81971f707001a000141bb041a000249f019138800011a000249f018201a000302590001011a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a000249f018201a00330da70101ff019f1a0003236119032c01011903e819023b00011903e8195e7104011903e818201a0001ca761928eb041959d818641959d818641959d818641959d818641959d818641959d81864186418641959d81864194c5118201a0002acfa182019b551041a000363151901ff00011a00015c3518201a000797751936f404021a0002ff941a0006ea7818dc0001011903e8196ff604021a0003bd081a00034ec5183e011a00102e0f19312a011a00032e801901a5011a0002da781903e819cf06011a00013a34182019a8f118201903e818201a00013aac0119e143041903e80a1a00030219189c011a00030219189c011a0003207c1901d9011a000330001901ff0119ccf3182019fd40182019ffd5182019581e18201940b318201a00012adf18201a0002ff941a0006ea7818dc0001011a00010f92192da7000119eabb18201a0002ff941a0006ea7818dc0001011a0002ff941a0006ea7818dc0001011a0011b22c1a0005fdde00021a000c504e197712041a001d6af61a0001425b041a00040c660004001a00014fab18201a0003236119032c010119a0de18201a00033d7618201979f41820197fb8182019a95d1820197df718201995aa18201a0223accc0a1a009063b91903fd0a1a02515e841980b30aff029f0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101ff181e1a075bc371f6826b6578616d706c652e636f6d5820c7ddb5b493faa4d3d2d679847740bdce0c5d358d56f9b1470ca67f5652a02745" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/create-constitution-for-stake-address.action.golden b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/create-constitution-for-stake-address.action.golden index 0a9e6843a8..ff917dc0c0 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/create-constitution-for-stake-address.action.golden +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/create-constitution-for-stake-address.action.golden @@ -1,5 +1,5 @@ { "cborHex": "", - "description": "", + "description": "Update to the Constitution or policy proposal", "type": "Governance proposal" } \ No newline at end of file diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/hardfork/conway-create-hardfork.action b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/hardfork/conway-create-hardfork.action index 6c5a43184e..b6b6afdf18 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/hardfork/conway-create-hardfork.action +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/action/hardfork/conway-create-hardfork.action @@ -1,5 +1,5 @@ { "type": "Governance proposal", - "description": "Hardfork initiation governance action", + "description": "Hardfork initiation proposal", "cborHex": "84193039581de18f4a3466a404c11eb410313015b88e447d81b60089e25f611600e6058301f6820a00826b6578616d706c652e636f6d5820c7ddb5b493faa4d3d2d679847740bdce0c5d358d56f9b1470ca67f5652a02745" } diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/update-committee-answer.json b/cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/update-committee-answer.json index bd5325ed25..f5a4f2018c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/update-committee-answer.json +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/update-committee-answer.json @@ -1,5 +1,5 @@ { "type": "Governance proposal", - "description": "", + "description": "New constitutional committee and/or threshold and/or terms proposal", "cborHex": "8400581de08f4a3466a404c11eb410313015b88e447d81b60089e25f611600e6058504f6d9010280a28200581cc0f2510d2353ee41a508b3c700c807e52697f2813fb014e3bc6982cd18ca8200581cf5ba9ae54a389cf97c54b981513d780877fc888579148044a8e7e7f218fcd81e8218331864826c687474703a2f2f64756d6d795820c9decb4498c4924d4f9804b6fa3425bab8f669f6452cb61f295114c906f3093e" }