fix genesis test + remove extra readfile

Author: Cmdv

cardano-chain-gen/test/Test/Cardano/Db/Mock/Config.hs

@@ -467,7 +467,7 @@ withFullConfig' WithConfigArgs {..} cmdLineArgs mSyncNodeConfig configFilePath t
   let dbsyncParams = syncNodeParams cfg
   trce <-
     if shouldLog
-      then configureLogging dbsyncParams "db-sync-node"
+      then configureLogging syncNodeConfig "db-sync-node"
       else pure nullTracer
   -- runDbSync is partially applied so we can pass in syncNodeParams at call site / within tests
   let partialDbSyncRun params = runDbSync emptyMetricsSetters migr iom trce params syncNodeConfig True

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config.hs

@@ -20,18 +20,18 @@ import Prelude ()
 conwayGenesis :: Assertion
 conwayGenesis =
   mkSyncNodeConfig configDir
-    >>= void . mkConfig configDir mutableDir cmdLineArgs
+    >>= void . mkConfig (mkConfigDir configDir) mutableDir cmdLineArgs
   where
-    configDir = mkConfigDir "config-conway"
+    configDir = "config-conway"
     mutableDir = mkMutableDir "conwayConfigSimple"
     cmdLineArgs = initCommandLineArgs
 
 missingConwayGenesis :: Assertion
 missingConwayGenesis = do
-  res <- try $ mkConfig configDir mutableDir cmdLineArgs =<< mkSyncNodeConfig configDir
+  res <- try $ mkConfig (mkConfigDir configDir) mutableDir cmdLineArgs =<< mkSyncNodeConfig configDir
   assertBool "Not a SyncNodeError" (isConwayConfigError res)
   where
-    configDir = mkConfigDir "config-conway-missing-genesis"
+    configDir = "config-conway-missing-genesis"
     mutableDir = mkMutableDir "conwayConfigMissingGenesis"
     cmdLineArgs = initCommandLineArgs
 
@@ -40,9 +40,9 @@ noConwayGenesis = do
   cfg <- mkSyncNodeConfig configDir
   let cfg' = cfg {dncConwayGenesisFile = Nothing}
   void $
-    mkConfig configDir mutableDir cmdLineArgs cfg'
+    mkConfig (mkConfigDir configDir) mutableDir cmdLineArgs cfg'
   where
-    configDir = mkConfigDir "config-conway"
+    configDir = "config-conway"
     mutableDir = mkMutableDir "conwayConfigNoGenesis"
     cmdLineArgs = initCommandLineArgs
 
@@ -51,9 +51,9 @@ noConwayGenesisHash = do
   cfg <- mkSyncNodeConfig configDir
   let cfg' = cfg {dncConwayGenesisHash = Nothing}
   void $
-    mkConfig configDir mutableDir initCommandLineArgs cfg'
+    mkConfig (mkConfigDir configDir) mutableDir initCommandLineArgs cfg'
   where
-    configDir = mkConfigDir "config-conway"
+    configDir = "config-conway"
     mutableDir = mkMutableDir "conwayConfigNoGenesis"
 
 wrongConwayGenesisHash :: Assertion
@@ -62,10 +62,10 @@ wrongConwayGenesisHash = do
   hash <- Aeson.throwDecode "\"0000000000000000000000000000000000000000000000000000000000000000\""
   let cfg' = cfg {dncConwayGenesisHash = Just hash}
 
-  res <- try (mkConfig configDir mutableDir initCommandLineArgs cfg')
+  res <- try (mkConfig (mkConfigDir configDir) mutableDir initCommandLineArgs cfg')
   assertBool "Not a SyncNodeError" (isConwayConfigError res)
   where
-    configDir = mkConfigDir "config-conway"
+    configDir = "config-conway"
     mutableDir = mkMutableDir "configConwayWrongGenesis"
 
 isConwayConfigError :: Either SyncNodeError a -> Bool

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

@@ -68,7 +68,7 @@ import Prelude (id)
 runDbSyncNode :: MetricSetters -> [(Text, Text)] -> SyncNodeParams -> SyncNodeConfig -> IO ()
 runDbSyncNode metricsSetters knownMigrations params syncNodeConfigFromFile =
   withIOManager $ \iomgr -> do
-    trce <- configureLogging params "db-sync-node"
+    trce <- configureLogging syncNodeConfigFromFile "db-sync-node"
 
     abortOnPanic <- hasAbortOnPanicEnv
     startupReport trce abortOnPanic params

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

@@ -33,14 +33,11 @@ import Cardano.DbSync.Config.Types
 import Cardano.Prelude
 import System.FilePath (takeDirectory, (</>))
 
-configureLogging :: SyncNodeParams -> Text -> IO (Trace IO Text)
-configureLogging params loggingName = do
-  let configFile = enpConfigFile params
-  enc <- readSyncNodeConfig configFile
-
-  if not (dncEnableLogging enc)
+configureLogging :: SyncNodeConfig -> Text -> IO (Trace IO Text)
+configureLogging syncNodeConfig loggingName = do
+  if not (dncEnableLogging syncNodeConfig)
     then pure Logging.nullTracer
-    else liftIO $ Logging.setupTrace (Right $ dncLoggingConfig enc) loggingName
+    else liftIO $ Logging.setupTrace (Right $ dncLoggingConfig syncNodeConfig) loggingName
 
 readSyncNodeConfig :: ConfigFile -> IO SyncNodeConfig
 readSyncNodeConfig (ConfigFile fp) = do