Merge pull request #4808 from input-output-hk/newhoggy/switch-to-hoistMaybe

Use hoistMaybe

Author: newhoggy

Diff for: cardano-api/src/Cardano/Api/Convenience/Query.hs

@@ -15,8 +15,8 @@ module Cardano.Api.Convenience.Query (
 
 import           Prelude
 
-import           Control.Monad.Trans.Except (ExceptT(..), except, runExceptT)
-import           Control.Monad.Trans.Except.Extra (firstExceptT)
+import           Control.Monad.Trans.Except (ExceptT (..), except, runExceptT)
+import           Control.Monad.Trans.Except.Extra (firstExceptT, hoistMaybe)
 import           Data.Bifunctor (first)
 import           Data.Function ((&))
 import           Data.Set (Set)
@@ -78,7 +78,7 @@ queryStateForBalancedTx era networkId allTxIns = runExceptT $ do
   qSbe <- except $ getSbe $ cardanoEraStyle era
 
   qeInMode <- toEraInMode era CardanoMode
-    & onNothingThrow (EraConsensusModeMismatch (AnyConsensusMode CardanoMode) (getIsCardanoEraConstraint era $ AnyCardanoEra era))
+    & hoistMaybe (EraConsensusModeMismatch (AnyConsensusMode CardanoMode) (getIsCardanoEraConstraint era $ AnyCardanoEra era))
 
   -- Queries
   let utxoQuery = QueryInEra qeInMode $ QueryInShelleyBasedEra qSbe

Diff for: cardano-api/src/Cardano/Api/Utils.hs

@@ -16,7 +16,6 @@ module Cardano.Api.Utils
   , failEitherWith
   , noInlineMaybeToStrictMaybe
   , note
-  , onNothingThrow
   , parseFilePath
   , readFileBlocking
   , renderEra
@@ -51,7 +50,6 @@ import           System.Directory (emptyPermissions, readable, setPermissions)
 #endif
 
 import           Cardano.Api.Eras
-import Control.Monad.Trans.Except (ExceptT, throwE)
 
 (?!) :: Maybe a -> e -> Either e a
 Nothing ?! e = Left e
@@ -61,9 +59,6 @@ Just x  ?! _ = Right x
 Left  e ?!. f = Left (f e)
 Right x ?!. _ = Right x
 
-onNothingThrow :: Monad m => e -> Maybe a -> ExceptT e m a
-onNothingThrow e = maybe (throwE e) pure
-
 {-# NOINLINE noInlineMaybeToStrictMaybe #-}
 noInlineMaybeToStrictMaybe :: Maybe a -> StrictMaybe a
 noInlineMaybeToStrictMaybe Nothing = SNothing