move all queries to cardano-db library

Author: Cmdv

cardano-chain-gen/cardano-chain-gen.cabal

@@ -44,7 +44,6 @@ library
                         Cardano.Mock.ChainDB
                         Cardano.Mock.ChainSync.Server
                         Cardano.Mock.ChainSync.State
-                        Cardano.Mock.Query
                         Cardano.Mock.Forging.Crypto
                         Cardano.Mock.Forging.Interpreter
                         Cardano.Mock.Forging.Tx.Alonzo
@@ -65,7 +64,6 @@ library
                       , cardano-binary
                       , cardano-crypto-class
                       , cardano-data
-                      , cardano-db
                       , cardano-ledger-allegra
                       , cardano-ledger-alonzo
                       , cardano-ledger-babbage
@@ -82,7 +80,6 @@ library
                       , containers
                       , contra-tracer
                       , directory
-                      , esqueleto
                       , extra
                       , mtl
                       , microlens
@@ -182,7 +179,6 @@ test-suite cardano-chain-gen
                       , contra-tracer
                       , data-default-class
                       , directory
-                      , esqueleto
                       , extra
                       , filepath
                       , int-cast
@@ -192,16 +188,13 @@ test-suite cardano-chain-gen
                       , tasty
                       , tasty-quickcheck
                       , text
-                      , transformers
                       , transformers-except
                       , tree-diff
                       , tasty-hunit
                       , monad-logger
                       , ouroboros-consensus
                       , ouroboros-consensus-cardano
                       , ouroboros-network-api
-                      , persistent
-                      , persistent-postgresql
                       , postgresql-simple
                       , QuickCheck
                       , quickcheck-state-machine:no-vendored-treediff

cardano-chain-gen/src/Cardano/Mock/Query.hs

@@ -73,7 +73,7 @@ import Cardano.Mock.ChainSync.Server
 import Cardano.Mock.Forging.Interpreter
 import Cardano.Node.Protocol.Shelley (readLeaderCredentials)
 import Cardano.Node.Types (ProtocolFilepaths (..))
-import Cardano.Prelude (NonEmpty ((:|)), ReaderT, panic, stderr, textShow)
+import Cardano.Prelude (NonEmpty ((:|)), panic, stderr, textShow, throwIO)
 import Cardano.SMASH.Server.PoolDataLayer
 import Control.Concurrent.Async (Async, async, cancel, poll)
 import Control.Concurrent.STM (atomically)
@@ -87,12 +87,10 @@ import Control.Concurrent.STM.TMVar (
 import Control.Exception (SomeException, bracket)
 import Control.Monad (void)
 import Control.Monad.Extra (eitherM)
-import Control.Monad.Logger (NoLoggingT, runNoLoggingT)
+import Control.Monad.Logger (NoLoggingT)
 import Control.Monad.Trans.Except.Extra (runExceptT)
 import Control.Tracer (nullTracer)
 import Data.Text (Text)
-import Database.Persist.Postgresql (createPostgresqlPool)
-import Database.Persist.Sql (SqlBackend)
 import Ouroboros.Consensus.Block.Forging
 import Ouroboros.Consensus.Byron.Ledger.Mempool ()
 import Ouroboros.Consensus.Config (TopLevelConfig)
@@ -235,7 +233,12 @@ queryDBSync env = DB.runWithConnectionNoLogging (getDBSyncPGPass env)
 getPoolLayer :: DBSyncEnv -> IO PoolDataLayer
 getPoolLayer env = do
   pgconfig <- runOrThrowIO $ DB.readPGPass (enpPGPassSource $ dbSyncParams env)
-  pool <- runNoLoggingT $ createPostgresqlPool (DB.toConnectionSetting pgconfig) 1 -- Pool size of 1 for tests
+  connSetting <- case DB.toConnectionSetting pgconfig of
+    Left err -> throwIO $ userError err
+    Right setting -> pure setting
+
+  -- Create the Hasql connection pool (using port as pool identifier, similar to your server)
+  pool <- DB.createHasqlConnectionPool [connSetting] 1 -- Pool size of 1 for tests
   pure $
     postgresqlPoolDataLayer
       nullTracer

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

@@ -34,6 +34,7 @@ insertConfig = do
           , sioPoolStats = PoolStatsConfig False
           , sioJsonType = JsonTypeDisable
           , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+          , sioDbDebug = False
           }
 
   dncInsertOptions cfg @?= expected