Skip to content

Commit b3b0a34

Browse files
CmdvCmdv
committed
convert persistent to hasql
1 parent f434016 commit b3b0a34

File tree

106 files changed

+3404
-2874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+3404
-2874
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Prelude ()
3636
queryVersionMajorFromEpoch ::
3737
MonadIO io =>
3838
Word64 ->
39-
ReaderT SqlBackend io (Maybe Word16)
39+
DB.DbAction io (Maybe Word16)
4040
queryVersionMajorFromEpoch epochNo = do
4141
res <- selectOne $ do
4242
prop <- from $ table @Db.EpochParam
@@ -48,7 +48,7 @@ queryVersionMajorFromEpoch epochNo = do
4848
queryParamProposalFromEpoch ::
4949
MonadIO io =>
5050
Word64 ->
51-
ReaderT SqlBackend io (Maybe Db.ParamProposal)
51+
DB.DbAction io (Maybe Db.ParamProposal)
5252
queryParamProposalFromEpoch epochNo = do
5353
res <- selectOne $ do
5454
prop <- from $ table @Db.ParamProposal
@@ -59,7 +59,7 @@ queryParamProposalFromEpoch epochNo = do
5959
queryParamFromEpoch ::
6060
MonadIO io =>
6161
Word64 ->
62-
ReaderT SqlBackend io (Maybe Db.EpochParam)
62+
DB.DbAction io (Maybe Db.EpochParam)
6363
queryParamFromEpoch epochNo = do
6464
res <- selectOne $ do
6565
param <- from $ table @Db.EpochParam
@@ -68,22 +68,22 @@ queryParamFromEpoch epochNo = do
6868
pure (entityVal <$> res)
6969

7070
-- | Query whether there any null tx deposits?
71-
queryNullTxDepositExists :: MonadIO io => ReaderT SqlBackend io Bool
71+
queryNullTxDepositExists :: MonadIO io => DB.DbAction io Bool
7272
queryNullTxDepositExists = do
7373
res <- select $ do
7474
tx <- from $ table @Db.Tx
7575
where_ $ isNothing_ (tx ^. Db.TxDeposit)
7676
pure $ not (null res)
7777

78-
queryMultiAssetCount :: MonadIO io => ReaderT SqlBackend io Word
78+
queryMultiAssetCount :: MonadIO io => DB.DbAction io Word
7979
queryMultiAssetCount = do
8080
res <- select $ do
8181
_ <- from (table @Db.MultiAsset)
8282
pure countRows
8383

8484
pure $ maybe 0 unValue (listToMaybe res)
8585

86-
queryTxMetadataCount :: MonadIO io => ReaderT SqlBackend io Word
86+
queryTxMetadataCount :: MonadIO io => DB.DbAction io Word
8787
queryTxMetadataCount = do
8888
res <- selectOne $ do
8989
_ <- from (table @Db.TxMetadata)
@@ -95,7 +95,7 @@ queryDRepDistrAmount ::
9595
MonadIO io =>
9696
ByteString ->
9797
Word64 ->
98-
ReaderT SqlBackend io Word64
98+
DB.DbAction io Word64
9999
queryDRepDistrAmount drepHash epochNo = do
100100
res <- selectOne $ do
101101
(distr :& hash) <-
@@ -113,7 +113,7 @@ queryDRepDistrAmount drepHash epochNo = do
113113

114114
queryGovActionCounts ::
115115
MonadIO io =>
116-
ReaderT SqlBackend io (Word, Word, Word, Word)
116+
DB.DbAction io (Word, Word, Word, Word)
117117
queryGovActionCounts = do
118118
ratified <- countNonNulls Db.GovActionProposalRatifiedEpoch
119119
enacted <- countNonNulls Db.GovActionProposalEnactedEpoch
@@ -125,7 +125,7 @@ queryGovActionCounts = do
125125
countNonNulls ::
126126
(MonadIO io, PersistField field) =>
127127
EntityField Db.GovActionProposal (Maybe field) ->
128-
ReaderT SqlBackend io Word
128+
DB.DbAction io Word
129129
countNonNulls field = do
130130
res <- selectOne $ do
131131
e <- from $ table @Db.GovActionProposal
@@ -137,7 +137,7 @@ queryGovActionCounts = do
137137
queryConstitutionAnchor ::
138138
MonadIO io =>
139139
Word64 ->
140-
ReaderT SqlBackend io (Maybe (Text, ByteString))
140+
DB.DbAction io (Maybe (Text, ByteString))
141141
queryConstitutionAnchor epochNo = do
142142
res <- selectOne $ do
143143
(_ :& anchor :& epochState) <-
@@ -160,7 +160,7 @@ queryConstitutionAnchor epochNo = do
160160

161161
queryRewardRests ::
162162
MonadIO io =>
163-
ReaderT SqlBackend io [(Db.RewardSource, Word64)]
163+
DB.DbAction io [(Db.RewardSource, Word64)]
164164
queryRewardRests = do
165165
res <- select $ do
166166
reward <- from $ table @Db.RewardRest
@@ -170,7 +170,7 @@ queryRewardRests = do
170170

171171
queryTreasuryDonations ::
172172
MonadIO io =>
173-
ReaderT SqlBackend io Word64
173+
DB.DbAction io Word64
174174
queryTreasuryDonations = do
175175
res <- selectOne $ do
176176
txs <- from $ table @Db.Tx
@@ -183,7 +183,7 @@ queryVoteCounts ::
183183
MonadIO io =>
184184
ByteString ->
185185
Word16 ->
186-
ReaderT SqlBackend io (Word64, Word64, Word64)
186+
DB.DbAction io (Word64, Word64, Word64)
187187
queryVoteCounts txHash idx = do
188188
yes <- countVotes Db.VoteYes
189189
no <- countVotes Db.VoteNo
@@ -210,7 +210,7 @@ queryVoteCounts txHash idx = do
210210
queryEpochStateCount ::
211211
MonadIO io =>
212212
Word64 ->
213-
ReaderT SqlBackend io Word64
213+
DB.DbAction io Word64
214214
queryEpochStateCount epochNo = do
215215
res <- selectOne $ do
216216
epochState <- from (table @Db.EpochState)
@@ -222,7 +222,7 @@ queryEpochStateCount epochNo = do
222222
queryCommitteeByTxHash ::
223223
MonadIO io =>
224224
ByteString ->
225-
ReaderT SqlBackend io (Maybe Db.Committee)
225+
DB.DbAction io (Maybe Db.Committee)
226226
queryCommitteeByTxHash txHash = do
227227
res <- selectOne $ do
228228
(committee :& _ :& tx) <-
@@ -244,7 +244,7 @@ queryCommitteeByTxHash txHash = do
244244
queryCommitteeMemberCountByTxHash ::
245245
MonadIO io =>
246246
Maybe ByteString ->
247-
ReaderT SqlBackend io Word64
247+
DB.DbAction io Word64
248248
queryCommitteeMemberCountByTxHash txHash = do
249249
res <- selectOne $ do
250250
(_ :& committee :& _ :& tx) <-

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module Test.Cardano.Db.Mock.Config (
5858
withCustomConfigAndLogs,
5959
withFullConfig',
6060
replaceConfigFile,
61-
txOutTableTypeFromConfig,
61+
txOutVariantTypeFromConfig,
6262
) where
6363

6464
import Cardano.Api (NetworkMagic (..))
@@ -226,7 +226,7 @@ withDBSyncEnv mkEnv = bracket mkEnv stopDBSyncIfRunning
226226
getDBSyncPGPass :: DBSyncEnv -> DB.PGPassSource
227227
getDBSyncPGPass = enpPGPassSource . dbSyncParams
228228

229-
queryDBSync :: DBSyncEnv -> ReaderT SqlBackend (NoLoggingT IO) a -> IO a
229+
queryDBSync :: DBSyncEnv -> DB.DbAction (NoLoggingT IO) a -> IO a
230230
queryDBSync env = DB.runWithConnectionNoLogging (getDBSyncPGPass env)
231231

232232
getPoolLayer :: DBSyncEnv -> IO PoolDataLayer
@@ -601,14 +601,14 @@ replaceConfigFile newFilename dbSync@DBSyncEnv {..} = do
601601
newParams =
602602
dbSyncParams {enpConfigFile = ConfigFile $ configDir </> newFilename}
603603

604-
txOutTableTypeFromConfig :: DBSyncEnv -> DB.TxOutTableType
605-
txOutTableTypeFromConfig dbSyncEnv =
604+
txOutVariantTypeFromConfig :: DBSyncEnv -> DB.TxOutVariantType
605+
txOutVariantTypeFromConfig dbSyncEnv =
606606
case sioTxOut $ dncInsertOptions $ dbSyncConfig dbSyncEnv of
607-
TxOutDisable -> DB.TxOutCore
607+
TxOutDisable -> DB.TxOutVariantCore
608608
TxOutEnable useTxOutAddress -> getTxOutTT useTxOutAddress
609609
TxOutConsumed _ useTxOutAddress -> getTxOutTT useTxOutAddress
610610
TxOutConsumedPrune _ useTxOutAddress -> getTxOutTT useTxOutAddress
611611
TxOutConsumedBootstrap _ useTxOutAddress -> getTxOutTT useTxOutAddress
612612
where
613-
getTxOutTT :: UseTxOutAddress -> DB.TxOutTableType
614-
getTxOutTT value = if unUseTxOutAddress value then DB.TxOutVariantAddress else DB.TxOutCore
613+
getTxOutTT :: UseTxOutAddress -> DB.TxOutVariantType
614+
getTxOutTT value = if unUseTxOutAddress value then DB.TxOutVariantAddress else DB.TxOutVariantCore

‎cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Alonzo/Plutus.hs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ module Test.Cardano.Db.Mock.Unit.Alonzo.Plutus (
2929
) where
3030

3131
import qualified Cardano.Crypto.Hash as Crypto
32-
import Cardano.Db (TxOutTableType (..))
32+
import Cardano.Db (TxOutVariantType (..))
3333
import qualified Cardano.Db as DB
34-
import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
35-
import qualified Cardano.Db.Schema.Variant.TxOutCore as C
34+
import qualified Cardano.Db.Schema.Variants.TxOutAddress as VA
35+
import qualified Cardano.Db.Schema.Variants.TxOutCore as VC
3636
import Cardano.DbSync.Era.Shelley.Generic.Util (renderAddress)
3737
import Cardano.Ledger.Coin
3838
import Cardano.Ledger.Mary.Value (MaryValue (..), MultiAsset (..), PolicyID (..))
@@ -97,18 +97,18 @@ simpleScript =
9797
where
9898
testLabel = "simpleScript-alonzo"
9999
getOutFields txOutW = case txOutW of
100-
DB.CTxOutW txOut ->
101-
( C.txOutAddress txOut
102-
, C.txOutAddressHasScript txOut
103-
, C.txOutValue txOut
104-
, C.txOutDataHash txOut
100+
DB.VCTxOutW txOut ->
101+
( VC.txOutAddress txOut
102+
, VC.txOutAddressHasScript txOut
103+
, VC.txOutValue txOut
104+
, VC.txOutDataHash txOut
105105
)
106-
DB.VTxOutW txout mAddress -> case mAddress of
106+
DB.VATxOutW txout mAddress -> case mAddress of
107107
Just address ->
108-
( V.addressAddress address
109-
, V.addressHasScript address
110-
, V.txOutValue txout
111-
, V.txOutDataHash txout
108+
( VA.addressAddress address
109+
, VA.addressHasScript address
110+
, VA.txOutValue txout
111+
, VA.txOutDataHash txout
112112
)
113113
Nothing -> error "AlonzoSimpleScript: expected an address"
114114
expectedFields =

‎cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Babbage/Plutus.hs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ module Test.Cardano.Db.Mock.Unit.Babbage.Plutus (
3232

3333
import qualified Cardano.Crypto.Hash as Crypto
3434
import qualified Cardano.Db as DB
35-
import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
36-
import qualified Cardano.Db.Schema.Variant.TxOutCore as C
35+
import qualified Cardano.Db.Schema.Variants.TxOutAddress as VA
36+
import qualified Cardano.Db.Schema.Variants.TxOutCore as VC
3737
import Cardano.DbSync.Era.Shelley.Generic.Util (renderAddress)
3838
import Cardano.Ledger.Coin
3939
import Cardano.Ledger.Mary.Value (MaryValue (..), MultiAsset (..), PolicyID (..))
@@ -63,7 +63,7 @@ import qualified Data.Map as Map
6363
import Data.Text (Text)
6464
import Ouroboros.Consensus.Cardano.Block (StandardBabbage)
6565
import Ouroboros.Network.Block (genesisPoint)
66-
import Test.Cardano.Db.Mock.Config (babbageConfigDir, startDBSync, txOutTableTypeFromConfig, withFullConfig, withFullConfigAndDropDB)
66+
import Test.Cardano.Db.Mock.Config (babbageConfigDir, startDBSync, txOutVariantTypeFromConfig, withFullConfig, withFullConfigAndDropDB)
6767
import Test.Cardano.Db.Mock.UnifiedApi (
6868
fillUntilNextEpoch,
6969
forgeNextAndSubmit,
@@ -91,7 +91,7 @@ simpleScript =
9191
withFullConfigAndDropDB babbageConfigDir testLabel $ \interpreter mockServer dbSync -> do
9292
startDBSync dbSync
9393

94-
let txOutTableType = txOutTableTypeFromConfig dbSync
94+
let txOutVariantType = txOutVariantTypeFromConfig dbSync
9595
void $ registerAllStakeCreds interpreter mockServer
9696

9797
a <- fillUntilNextEpoch interpreter mockServer
@@ -101,23 +101,23 @@ simpleScript =
101101
Babbage.mkLockByScriptTx (UTxOIndex 0) [Babbage.TxOutNoInline True] 20000 20000
102102

103103
assertBlockNoBackoff dbSync (fromIntegral $ length a + 2)
104-
assertEqQuery dbSync (fmap getOutFields <$> DB.queryScriptOutputs txOutTableType) [expectedFields] "Unexpected script outputs"
104+
assertEqQuery dbSync (fmap getOutFields <$> DB.queryScriptOutputs txOutVariantType) [expectedFields] "Unexpected script outputs"
105105
where
106106
testLabel = "simpleScript"
107107
getOutFields txOutW =
108108
case txOutW of
109-
DB.CTxOutW txOut ->
110-
( C.txOutAddress txOut
111-
, C.txOutAddressHasScript txOut
112-
, C.txOutValue txOut
113-
, C.txOutDataHash txOut
109+
DB.VCTxOutW txOut ->
110+
( VC.txOutAddress txOut
111+
, VC.txOutAddressHasScript txOut
112+
, VC.txOutValue txOut
113+
, VC.txOutDataHash txOut
114114
)
115-
DB.VTxOutW txOut mAddress -> case mAddress of
115+
DB.VATxOutW txOut mAddress -> case mAddress of
116116
Just address ->
117-
( V.addressAddress address
118-
, V.addressHasScript address
119-
, V.txOutValue txOut
120-
, V.txOutDataHash txOut
117+
( VA.addressAddress address
118+
, VA.addressHasScript address
119+
, VA.txOutValue txOut
120+
, VA.txOutDataHash txOut
121121
)
122122
Nothing -> error "BabbageSimpleScript: expected an address"
123123

0 commit comments

Comments
 (0)