Address reviews

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/Orphan.hs

@@ -24,7 +24,6 @@ import Cardano.Ledger.Conway.Governance qualified as L
 import Cardano.Ledger.State qualified as L
 
 import Data.Aeson
-import Data.Text qualified as Text
 
 instance ToJSON L.DefaultVote where
   toJSON defaultVote =
@@ -58,6 +57,8 @@ instance ToJSON HashableScriptData where
       , "json" .= scriptDataToJsonDetailedSchema hsd
       ]
 
+-- TODO: Convert readVerificationKeySource to use CIO. We can then
+-- remove this instance
 instance
   Error
     ( Either
@@ -72,7 +73,7 @@ instance
     Right e -> prettyError e
 
 instance Error GovernancePollError where
-  prettyError = pshow . Text.unpack . renderGovernancePollError
+  prettyError = pretty . renderGovernancePollError
 
 instance Error String where
-  prettyError = pshow
+  prettyError = pretty

cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/governance_committee_checks_wrong_hash_fails.out

@@ -0,0 +1,17 @@
+Command failed: governance committee create-cold-key-resignation-certificate
+Error: Command failed: governance committee create-cold-key-resignation-certificate
+Error: Hashes do not match!
+Expected: "ee38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c"
+  Actual: "de38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c"
+CallStack (from HasCallStack):
+  fromExceptTCli, called at src/Cardano/CLI/EraBased/Governance/Committee/Run.hs:179:10 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.Committee.Run
+  runGovernanceCommitteeColdKeyResignationCertificate, called at src/Cardano/CLI/EraBased/Governance/Committee/Run.hs:47:5 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.Committee.Run
+  runGovernanceCommitteeCmds, called at src/Cardano/CLI/EraBased/Governance/Run.hs:51:5 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.Run
+  runGovernanceCmds, called at src/Cardano/CLI/EraBased/Run.hs:54:20 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Run
+
+HasCallStack backtrace:
+  collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
+  toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
+  throwIO, called at src/UnliftIO/Exception.hs:441:20 in unliftio-0.2.25.1-72aefeaee6ad674227745dd80100c28616aed606398ce50b030ba8dc9e02a8b9:UnliftIO.Exception
+
+

cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep_metadata_hash_url_wrong_hash_fails.out

@@ -0,0 +1,17 @@
+Command failed: governance drep metadata-hash
+Error: Command failed: governance drep metadata-hash
+Error: Hashes do not match!
+Expected: "ee38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c"
+  Actual: "de38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c"
+CallStack (from HasCallStack):
+  throwCliError, called at src/Cardano/CLI/EraBased/Governance/DRep/Run.hs:207:13 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.DRep.Run
+  runGovernanceDRepMetadataHashCmd, called at src/Cardano/CLI/EraBased/Governance/DRep/Run.hs:58:5 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.DRep.Run
+  runGovernanceDRepCmds, called at src/Cardano/CLI/EraBased/Governance/Run.hs:55:5 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.Run
+  runGovernanceCmds, called at src/Cardano/CLI/EraBased/Run.hs:54:20 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Run
+
+HasCallStack backtrace:
+  collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
+  toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
+  throwIO, called at src/UnliftIO/Exception.hs:441:20 in unliftio-0.2.25.1-72aefeaee6ad674227745dd80100c28616aed606398ce50b030ba8dc9e02a8b9:UnliftIO.Exception
+
+

cardano-cli/test/cardano-cli-golden/files/golden/governance/vote/governance_vote_create_hash_fails.out

@@ -0,0 +1,17 @@
+Command failed: governance vote create
+Error: Command failed: governance vote create
+Error: Hashes do not match!
+Expected: "ee38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c"
+  Actual: "de38a4f5b8b9d8372386cc923bad19d1a0662298cf355bbe947e5eedf127fa9c"
+CallStack (from HasCallStack):
+  fromExceptTCli, called at src/Cardano/CLI/EraBased/Governance/Vote/Run.hs:68:8 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.Vote.Run
+  runGovernanceVoteCreateCmd, called at src/Cardano/CLI/EraBased/Governance/Vote/Run.hs:41:5 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.Vote.Run
+  runGovernanceVoteCmds, called at src/Cardano/CLI/EraBased/Governance/Run.hs:59:5 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Governance.Run
+  runGovernanceCmds, called at src/Cardano/CLI/EraBased/Run.hs:54:20 in cardano-cli-10.8.0.0-inplace:Cardano.CLI.EraBased.Run
+
+HasCallStack backtrace:
+  collectBacktraces, called at libraries/ghc-internal/src/GHC/Internal/Exception.hs:92:13 in ghc-internal:GHC.Internal.Exception
+  toExceptionWithBacktrace, called at libraries/ghc-internal/src/GHC/Internal/IO.hs:260:11 in ghc-internal:GHC.Internal.IO
+  throwIO, called at src/UnliftIO/Exception.hs:441:20 in unliftio-0.2.25.1-72aefeaee6ad674227745dd80100c28616aed606398ce50b030ba8dc9e02a8b9:UnliftIO.Exception
+
+