Define Functor instance for FileError

IntersectMBO · Apr 6, 2023 · 140c7a5 · 140c7a5
1 parent 27f8437
commit 140c7a5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/cardano-api/src/Cardano/Api/Error.hs b/cardano-api/src/Cardano/Api/Error.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE GADTSyntax #-}
 
@@ -38,15 +39,15 @@ instance Exception ErrorAsException where
     displayException (ErrorAsException e) = displayError e
 
 
-data FileError e = FileError   FilePath e
+data FileError e = FileError FilePath e
                  | FileErrorTempFile
                      FilePath
                      -- ^ Target path
                      FilePath
                      -- ^ Temporary path
                      Handle
                  | FileIOError FilePath IOException
-  deriving (Show, Eq)
+  deriving (Show, Eq, Functor)
 
 instance Error e => Error (FileError e) where
   displayError (FileErrorTempFile targetPath tempPath h)=

diff --git a/cardano-api/src/Cardano/Api/Keys/Read.hs b/cardano-api/src/Cardano/Api/Keys/Read.hs
@@ -49,18 +49,7 @@ readKeyFileTextEnvelope
   -> FilePath
   -> IO (Either (FileError InputDecodeError) a)
 readKeyFileTextEnvelope asType fp =
-    first toInputDecodeError <$> readFileTextEnvelope asType fp
-  where
-    toInputDecodeError
-      :: FileError TextEnvelopeError
-      -> FileError InputDecodeError
-    toInputDecodeError err =
-      case err of
-        FileIOError path ex -> FileIOError path ex
-        FileError path textEnvErr ->
-          FileError path (InputTextEnvelopeError textEnvErr)
-        FileErrorTempFile targetP tempP h ->
-          FileErrorTempFile targetP tempP h
+    first (fmap InputTextEnvelopeError) <$> readFileTextEnvelope asType fp
 
 -- | Read a cryptographic key from a file given that it is one of the provided
 -- types.