Remove QueryCmdLocalStateQueryError: its only use is better served by…

… QueryCmdEraMismatch
IntersectMBO · Dec 13, 2024 · c730206 · c730206
1 parent d37c5f7
commit c730206
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 49 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -176,7 +176,6 @@ library
     Cardano.CLI.Types.Errors.PlutusScriptDecodeError
     Cardano.CLI.Types.Errors.ProtocolParamsError
     Cardano.CLI.Types.Errors.QueryCmdError
-    Cardano.CLI.Types.Errors.QueryCmdLocalStateQueryError
     Cardano.CLI.Types.Errors.RegistrationError
     Cardano.CLI.Types.Errors.ScriptDataError
     Cardano.CLI.Types.Errors.ScriptDecodeError

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs
@@ -52,7 +52,6 @@ import           Cardano.CLI.Helpers
 import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Errors.NodeEraMismatchError
 import           Cardano.CLI.Types.Errors.QueryCmdError
-import           Cardano.CLI.Types.Errors.QueryCmdLocalStateQueryError
 import           Cardano.CLI.Types.Key
 import           Cardano.CLI.Types.Output (QueryDRepStateOutput (..))
 import qualified Cardano.CLI.Types.Output as O
@@ -1840,9 +1839,7 @@ requireEon
 -- TODO: implement 'Bounded' for `Some eon` and remove 'minEra'
 requireEon minEra era =
   hoistMaybe
-    ( QueryCmdLocalStateQueryError $
-        mkEraMismatchError NodeEraMismatchError{nodeEra = era, era = minEra}
-    )
+    (mkEraMismatchError NodeEraMismatchError{nodeEra = era, era = minEra})
     (forEraMaybeEon era)
 
 -- | The output format to use, for commands with a recently introduced --output-[json,text] flag
@@ -1858,13 +1855,16 @@ newOutputFormat format mOutFile =
 strictTextToLazyBytestring :: Text -> LBS.ByteString
 strictTextToLazyBytestring t = BS.fromChunks [Text.encodeUtf8 t]
 
-easyRunQueryCurrentEra :: ExceptT QueryCmdError (LocalStateQueryExpr block point QueryInMode r IO) AnyCardanoEra
+easyRunQueryCurrentEra
+  :: ExceptT QueryCmdError (LocalStateQueryExpr block point QueryInMode r IO) AnyCardanoEra
 easyRunQueryCurrentEra = lift queryCurrentEra & onLeft (left . QueryCmdUnsupportedNtcVersion)
 
-easyRunQueryEraHistory :: ExceptT QueryCmdError (LocalStateQueryExpr block point QueryInMode r IO) EraHistory
+easyRunQueryEraHistory
+  :: ExceptT QueryCmdError (LocalStateQueryExpr block point QueryInMode r IO) EraHistory
 easyRunQueryEraHistory = lift queryEraHistory & onLeft (left . QueryCmdUnsupportedNtcVersion)
 
-easyRunQuerySystemStart :: ExceptT QueryCmdError (LocalStateQueryExpr block point QueryInMode r IO) SystemStart
+easyRunQuerySystemStart
+  :: ExceptT QueryCmdError (LocalStateQueryExpr block point QueryInMode r IO) SystemStart
 easyRunQuerySystemStart = lift querySystemStart & onLeft (left . QueryCmdUnsupportedNtcVersion)
 
 easyRunQuery
@@ -1874,4 +1874,4 @@ easyRunQuery
 easyRunQuery q =
   lift q
     & onLeft (left . QueryCmdUnsupportedNtcVersion)
-    & onLeft (left . QueryCmdLocalStateQueryError . EraMismatchError)
+    & onLeft (left . QueryCmdEraMismatch)
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdError.hs
@@ -5,12 +5,14 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.CLI.Types.Errors.QueryCmdError
   ( QueryCmdError (..)
   , renderQueryCmdError
+  , mkEraMismatchError
   )
 where
 
@@ -21,7 +23,7 @@ import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 import           Cardano.Binary (DecoderError)
 import           Cardano.CLI.Helpers (HelpersError (..), renderHelpersError)
 import           Cardano.CLI.Types.Errors.GenesisCmdError
-import           Cardano.CLI.Types.Errors.QueryCmdLocalStateQueryError
+import           Cardano.CLI.Types.Errors.NodeEraMismatchError (NodeEraMismatchError (..))
 
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import           Data.Text.Lazy.Builder (toLazyText)
@@ -31,8 +33,7 @@ import           Formatting.Buildable (build)
 {- HLINT ignore "Redundant flip" -}
 
 data QueryCmdError
-  = QueryCmdLocalStateQueryError !QueryCmdLocalStateQueryError
-  | QueryCmdConvenienceError !QueryConvenienceError
+  = QueryCmdConvenienceError !QueryConvenienceError
   | QueryCmdWriteFileError !(FileError ())
   | QueryCmdHelpersError !HelpersError
   | QueryCmdAcquireFailure !AcquiringFailure
@@ -56,10 +57,16 @@ data QueryCmdError
   | QueryCmdCommitteeHotKeyError !(FileError InputDecodeError)
   deriving Show
 
+mkEraMismatchError :: NodeEraMismatchError -> QueryCmdError
+mkEraMismatchError NodeEraMismatchError{nodeEra, era} =
+  QueryCmdEraMismatch $
+    EraMismatch
+      { ledgerEraName = docToText $ pretty nodeEra
+      , otherEraName = docToText $ pretty era
+      }
+
 renderQueryCmdError :: QueryCmdError -> Doc ann
 renderQueryCmdError = \case
-  QueryCmdLocalStateQueryError lsqErr ->
-    prettyError lsqErr
   QueryCmdWriteFileError fileErr ->
     prettyError fileErr
   QueryCmdHelpersError helpersErr ->

diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/QueryCmdLocalStateQueryError.hs