Add outstanding Error instances

IntersectMBO · Feb 11, 2025 · 5a36d5d · 5a36d5d
1 parent 96e5e11
commit 5a36d5d
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -68,6 +68,7 @@ library
     Cardano.CLI.Commands.Node
     Cardano.CLI.Commands.Ping
     Cardano.CLI.Compatible.Commands
+    Cardano.CLI.Compatible.Exception
     Cardano.CLI.Compatible.Governance
     Cardano.CLI.Compatible.Run
     Cardano.CLI.Compatible.Transaction
@@ -251,6 +252,7 @@ library
     prettyprinter,
     prettyprinter-ansi-terminal,
     random,
+    rio,
     split,
     strict-stm,
     text <2.1.2,

diff --git a/cardano-cli/src/Cardano/CLI/Orphans.hs b/cardano-cli/src/Cardano/CLI/Orphans.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE StandaloneDeriving #-}
@@ -10,10 +11,13 @@ where
 
 import           Cardano.Api
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley (scriptDataToJsonDetailedSchema)
+import           Cardano.Api.Shelley (VotesMergingConflict, scriptDataToJsonDetailedSchema)
 
 import           Data.Aeson
 
+instance Error (VotesMergingConflict era) where
+  prettyError = pretty . show
+
 -- TODO upstream this orphaned instance to the ledger
 instance (L.EraTxOut ledgerera, L.EraGov ledgerera) => ToJSON (L.NewEpochState ledgerera) where
   toJSON (L.NewEpochState nesEL nesBprev nesBCur nesEs nesRu nesPd _stashedAvvm) =

diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -717,6 +717,15 @@ data ReadWitnessSigningDataError
     ReadWitnessSigningDataSigningKeyAndAddressMismatch
   deriving Show
 
+instance Error ReadWitnessSigningDataError where
+  prettyError = \case
+    ReadWitnessSigningDataSigningKeyDecodeError fileErr ->
+      prettyError fileErr
+    ReadWitnessSigningDataScriptError fileErr ->
+      prettyError fileErr
+    ReadWitnessSigningDataSigningKeyAndAddressMismatch ->
+      "Only a Byron signing key may be accompanied by a Byron address."
+
 -- | Render an error message for a 'ReadWitnessSigningDataError'.
 renderReadWitnessSigningDataError :: ReadWitnessSigningDataError -> Doc ann
 renderReadWitnessSigningDataError = \case

diff --git a/cardano-cli/src/Cardano/CLI/Run.hs b/cardano-cli/src/Cardano/CLI/Run.hs
@@ -39,7 +39,7 @@ import           Cardano.CLI.Types.Errors.NodeCmdError
 import           Cardano.CLI.Types.Errors.QueryCmdError
 import           Cardano.Git.Rev (gitRev)
 
-import           Control.Monad (forM_)
+import           Control.Monad
 import           Data.Function
 import qualified Data.List as L
 import           Data.Text (Text)

diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/BootstrapWitnessError.hs
@@ -4,7 +4,7 @@ module Cardano.CLI.Types.Errors.BootstrapWitnessError
   )
 where
 
-import           Prettyprinter
+import           Cardano.Api
 
 -- | Error constructing a Shelley bootstrap witness (i.e. a Byron key witness
 -- in the Shelley era).
@@ -14,6 +14,9 @@ data BootstrapWitnessError
     MissingNetworkIdOrByronAddressError
   deriving Show
 
+instance Error BootstrapWitnessError where
+  prettyError = renderBootstrapWitnessError
+
 -- | Render an error message for a 'BootstrapWitnessError'.
 renderBootstrapWitnessError :: BootstrapWitnessError -> Doc ann
 renderBootstrapWitnessError MissingNetworkIdOrByronAddressError =

diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs
@@ -95,6 +95,12 @@ data TxCmdError
   | TxCmdHashCheckError L.Url HashCheckError
   | TxCmdUnregisteredStakeAddress !(Set StakeCredential)
 
+instance Show TxCmdError where
+  show = show . renderTxCmdError
+
+instance Error TxCmdError where
+  prettyError = renderTxCmdError
+
 renderTxCmdError :: TxCmdError -> Doc ann
 renderTxCmdError = \case
   TxCmdProtocolParamsConverstionError err' ->