flatten result after tryJust to a single 'Either'

cardano-foundation · Jan 14, 2020 · 9d61437 · 9d61437
1 parent 25fa318
commit 9d61437
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/core/src/Cardano/DB/Sqlite.hs b/lib/core/src/Cardano/DB/Sqlite.hs
@@ -45,7 +45,7 @@ import Control.Concurrent.MVar
 import Control.Exception
     ( Exception, bracket_, tryJust )
 import Control.Monad
-    ( mapM_ )
+    ( join, mapM_ )
 import Control.Monad.Catch
     ( Handler (..), MonadCatch (..), handleIf, handleJust )
 import Control.Monad.Logger
@@ -191,6 +191,8 @@ startSqliteBackend migrateAll trace fp = do
     migrations <- runQuery (runMigrationQuiet migrateAll)
         & tryJust (matchMigrationError @PersistException)
         & tryJust (matchMigrationError @SqliteException)
+        & fmap join
+        :: IO (Either MigrationError [Text])
     traceWith trace $ MsgMigrations (fmap length migrations)
     let ctx = SqliteContext backend runQuery fp trace
     case migrations of

diff --git a/lib/core/test/unit/Cardano/Pool/DB/SqliteSpec.hs b/lib/core/test/unit/Cardano/Pool/DB/SqliteSpec.hs
@@ -53,9 +53,7 @@ test_migrationFromv20191216 =
                 withDBLayer tr (Just path) $ \_ -> pure ()
 
             let databaseConnMsg  = filter isMsgConnStr logs
-
             let databaseResetMsg = filter (== MsgDatabaseReset) logs
-
             let migrationErrMsg  = filter isMsgMigrationError logs
 
             length databaseConnMsg  `shouldBe` 3