adjusting runDbTransSilent to not be maybe

Author: Cmdv

cardano-db-sync/src/Cardano/DbSync/Api.hs

@@ -247,7 +247,7 @@ getInsertOptions :: SyncEnv -> InsertOptions
 getInsertOptions = soptInsertOptions . envOptions
 
 getSlotHash :: DB.DbEnv -> SlotNo -> IO [(SlotNo, ByteString)]
-getSlotHash backend slotNo = DB.runDbTransSilent backend (Just DB.ReadCommitted) (DB.querySlotHash slotNo)
+getSlotHash backend slotNo = DB.runDbTransSilent backend DB.ReadCommitted (DB.querySlotHash slotNo)
 
 hasLedgerState :: SyncEnv -> Bool
 hasLedgerState syncEnv =
@@ -258,7 +258,7 @@ hasLedgerState syncEnv =
 getDbLatestBlockInfo :: DB.DbEnv -> IO (Maybe TipInfo)
 getDbLatestBlockInfo dbEnv = do
   runMaybeT $ do
-    block <- MaybeT $ DB.runDbTransSilent dbEnv (Just DB.ReadCommitted) DB.queryLatestBlock
+    block <- MaybeT $ DB.runDbTransSilent dbEnv DB.ReadCommitted DB.queryLatestBlock
     -- The EpochNo, SlotNo and BlockNo can only be zero for the Byron
     -- era, but we need to make the types match, hence `fromMaybe`.
     pure $
@@ -324,7 +324,7 @@ mkSyncEnv ::
   Bool ->
   IO SyncEnv
 mkSyncEnv metricSetters trce dbEnv syncOptions protoInfo nw maxLovelaceSupply nwMagic systemStart syncNodeConfigFromFile syncNP runNearTipMigrationFnc isJsonbInSchema = do
-  dbCNamesVar <- newTVarIO =<< DB.runDbTransSilent dbEnv (Just DB.ReadCommitted) DB.queryRewardAndEpochStakeConstraints
+  dbCNamesVar <- newTVarIO =<< DB.runDbTransSilent dbEnv DB.ReadCommitted DB.queryRewardAndEpochStakeConstraints
   cache <-
     if soptCache syncOptions
       then
@@ -461,7 +461,7 @@ getLatestPoints env = do
       verifySnapshotPoint env snapshotPoints
     NoLedger _ -> do
       -- Brings the 5 latest.
-      lastPoints <- DB.runDbTransSilent (envDbEnv env) (Just DB.ReadCommitted) DB.queryLatestPoints
+      lastPoints <- DB.runDbDirectSilent (envDbEnv env) DB.queryLatestPoints
       pure $ mapMaybe convert lastPoints
   where
     convert (Nothing, _) = Nothing
@@ -516,7 +516,7 @@ getBootstrapInProgress ::
   DB.DbEnv ->
   IO Bool
 getBootstrapInProgress trce bootstrapFlag dbEnv = do
-  DB.runDbTransSilent dbEnv (Just DB.ReadCommitted) $ do
+  DB.runDbTransSilent dbEnv DB.ReadCommitted $ do
     ems <- DB.queryAllExtraMigrations
     let btsState = DB.bootstrapState ems
     case (bootstrapFlag, btsState) of

cardano-db-sync/src/Cardano/DbSync/DbEvent.hs

@@ -89,7 +89,7 @@ runDbSyncTransactionNoLogging ::
   m (Either SyncNodeError a)
 runDbSyncTransactionNoLogging dbEnv exceptTAction = do
   let dbAction = runExceptT exceptTAction
-  eResult <- liftIO $ try $ DB.runDbTransSilent dbEnv Nothing dbAction
+  eResult <- liftIO $ try $ DB.runDbTransSilent dbEnv DB.RepeatableRead dbAction
   case eResult of
     Left (dbErr :: DB.DbSessionError) -> do
       pure $ Left $ SNErrDbSessionErr mkSyncNodeCallStack dbErr

cardano-db-sync/src/Cardano/DbSync/Rollback.hs

@@ -68,7 +68,7 @@ rollbackFromBlockNo syncEnv blkNo = do
 
 prepareRollback :: SyncEnv -> CardanoPoint -> Tip CardanoBlock -> IO (Either SyncNodeError Bool)
 prepareRollback syncEnv point serverTip = do
-  DB.runDbTransSilent (envDbEnv syncEnv) (Just DB.ReadCommitted) $ runExceptT action
+  DB.runDbTransSilent (envDbEnv syncEnv) DB.ReadCommitted $ runExceptT action
   where
     trce = getTrace syncEnv
 

cardano-db/src/Cardano/Db/Run.hs

@@ -90,21 +90,19 @@ runDbTransLogged tracer dbEnv mIsolationLevel action = do
 runDbTransSilent ::
   MonadUnliftIO m =>
   DbEnv ->
-  Maybe IsolationLevel -> -- Optional isolation level
+  IsolationLevel ->
   DbM a ->
   m a
-runDbTransSilent dbEnv mIsolationLevel action = do
+runDbTransSilent dbEnv isolationLevel action = do
   runNoLoggingT $ do
     result <- liftIO $ HsqlS.run transactionSession (dbConnection dbEnv)
     case result of
       Left sessionErr ->
         throwIO $ DbSessionError mkDbCallStack ("Database transaction error: " <> formatSessionError sessionErr)
       Right dbResult -> pure dbResult
   where
-    isolationLevel = fromMaybe RepeatableRead mIsolationLevel
     transactionSession = do
       HsqlS.statement () (beginTransactionStmt isolationLevel)
-
       result <- liftIO $ try @SomeException $ runReaderT (runDbM action) dbEnv
       case result of
         Left err -> do
@@ -272,7 +270,7 @@ runDbStandaloneTransSilent source action = do
     HsqlCon.release
     ( \connection -> do
         let dbEnv = createDbEnv connection Nothing Nothing
-        runDbTransSilent dbEnv Nothing action
+        runDbTransSilent dbEnv RepeatableRead action
     )
 
 -- | Standalone runner without transaction management