Skip to content

Commit c3c61d6

Browse files
Cmdvkderme
authored andcommitted
update test configs for consumed txout
Modified-by: Cmdv <[email protected]>
1 parent 182cdb4 commit c3c61d6

File tree

10 files changed

+676
-1429
lines changed

10 files changed

+676
-1429
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ module Test.Cardano.Db.Mock.Config (
1919
getPoolLayer,
2020
mkConfig,
2121
mkSyncNodeConfig,
22+
mkCustomSyncNodeConfig,
2223
mkConfigDir,
2324
mkFingerPrint,
2425
mkMutableDir,
@@ -242,6 +243,11 @@ mkSyncNodeConfig configFilePath cmdLineArgs =
242243
configFilename = claConfigFilename cmdLineArgs
243244
configDir = mkConfigDir configFilePath
244245

246+
mkCustomSyncNodeConfig :: FilePath -> CommandLineArgs -> (SyncNodeConfig -> SyncNodeConfig) -> IO SyncNodeConfig
247+
mkCustomSyncNodeConfig cfgDir args updateFn = do
248+
initConfigFile <- mkSyncNodeConfig cfgDir args
249+
pure $ updateFn initConfigFile
250+
245251
mkShelleyCredentials :: FilePath -> IO [ShelleyLeaderCredentials StandardCrypto]
246252
mkShelleyCredentials bulkFile = do
247253
eitherM (panic . textShow) pure $ runExceptT $ readLeaderCredentials (Just protFiles)

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

Lines changed: 279 additions & 285 deletions
Large diffs are not rendered by default.

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

Lines changed: 23 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import Test.Tasty.HUnit (Assertion ())
1818

1919
configRemoveJsonbFromSchemaEnabled :: IOManager -> [(Text, Text)] -> Assertion
2020
configRemoveJsonbFromSchemaEnabled ioManager metadata = do
21-
syncNodeConfig <- mksNodeConfig
21+
syncNodeConfig <- mkCustomSyncNodeConfig cfgDir args config
2222
withCustomConfigAndDropDB args (Just syncNodeConfig) cfgDir testLabel action ioManager metadata
2323
where
24-
action = \_interpreter _mockServer dbSync -> do
24+
action _interpreter _mockServer dbSync = do
2525
startDBSync dbSync
2626
threadDelay 7_000_000
2727
assertEqQuery
@@ -36,21 +36,16 @@ configRemoveJsonbFromSchemaEnabled ioManager metadata = do
3636

3737
cfgDir = conwayConfigDir
3838

39-
mksNodeConfig :: IO SyncNodeConfig
40-
mksNodeConfig = do
41-
initConfigFile <- mkSyncNodeConfig cfgDir args
42-
let dncInsertOptions' = dncInsertOptions initConfigFile
43-
pure $
44-
initConfigFile
45-
{ dncInsertOptions = dncInsertOptions' {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig True}
46-
}
39+
config :: SyncNodeConfig -> SyncNodeConfig
40+
config cfg = do
41+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig True}}
4742

4843
configRemoveJsonbFromSchemaDisabled :: IOManager -> [(Text, Text)] -> Assertion
4944
configRemoveJsonbFromSchemaDisabled ioManager metadata = do
50-
syncNodeConfig <- mksNodeConfig
45+
syncNodeConfig <- mkCustomSyncNodeConfig cfgDir args config
5146
withCustomConfigAndDropDB args (Just syncNodeConfig) cfgDir testLabel action ioManager metadata
5247
where
53-
action = \_interpreter _mockServer dbSync -> do
48+
action _interpreter _mockServer dbSync = do
5449
startDBSync dbSync
5550
threadDelay 7_000_000
5651
assertEqQuery
@@ -62,62 +57,49 @@ configRemoveJsonbFromSchemaDisabled ioManager metadata = do
6257

6358
args = initCommandLineArgs {claFullMode = False}
6459
testLabel = "conwayConfigRemoveJsonbFromSchemaDisabled"
65-
6660
cfgDir = conwayConfigDir
67-
68-
mksNodeConfig :: IO SyncNodeConfig
69-
mksNodeConfig = do
70-
initConfigFile <- mkSyncNodeConfig cfgDir args
71-
let dncInsertOptions' = dncInsertOptions initConfigFile
72-
pure $
73-
initConfigFile
74-
{ dncInsertOptions = dncInsertOptions' {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False}
75-
}
61+
config :: SyncNodeConfig -> SyncNodeConfig
62+
config cfg =
63+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False}}
7664

7765
configJsonbInSchemaShouldRemoveThenAdd :: IOManager -> [(Text, Text)] -> Assertion
7866
configJsonbInSchemaShouldRemoveThenAdd ioManager metadata = do
79-
syncNodeConfig <- mksNodeConfig
67+
syncNodeConfig <- mkCustomSyncNodeConfig cfgDir args config
8068
withCustomConfigAndDropDB args (Just syncNodeConfig) cfgDir testLabel action ioManager metadata
8169
where
82-
action = \_interpreter _mockServer dbSync -> do
83-
startDBSync dbSync
70+
action _interpreter _mockServer dbSyncEnv = do
71+
startDBSync dbSyncEnv
8472
threadDelay 7_000_000
8573
assertEqQuery
86-
dbSync
74+
dbSyncEnv
8775
DB.queryJsonbInSchemaExists
8876
False
8977
"There should be no jsonb types in database if option has been enabled"
90-
stopDBSync dbSync
78+
stopDBSync dbSyncEnv
9179
let newDbSyncEnv =
92-
dbSync
80+
dbSyncEnv
9381
{ dbSyncConfig =
94-
(dbSyncConfig dbSync)
82+
(dbSyncConfig dbSyncEnv)
9583
{ dncInsertOptions =
96-
(dncInsertOptions $ dbSyncConfig dbSync)
84+
(dncInsertOptions $ dbSyncConfig dbSyncEnv)
9785
{ sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
9886
}
9987
}
10088
}
10189
startDBSync newDbSyncEnv
10290
threadDelay 7_000_000
10391
assertEqQuery
104-
dbSync
92+
dbSyncEnv
10593
DB.queryJsonbInSchemaExists
10694
True
10795
"There should be jsonb types in database if option has been disabled"
10896
-- Expected to fail
109-
checkStillRuns dbSync
97+
checkStillRuns dbSyncEnv
11098

11199
args = initCommandLineArgs {claFullMode = False}
112100
testLabel = "configJsonbInSchemaShouldRemoveThenAdd"
113-
114101
cfgDir = conwayConfigDir
115102

116-
mksNodeConfig :: IO SyncNodeConfig
117-
mksNodeConfig = do
118-
initConfigFile <- mkSyncNodeConfig cfgDir args
119-
let dncInsertOptions' = dncInsertOptions initConfigFile
120-
pure $
121-
initConfigFile
122-
{ dncInsertOptions = dncInsertOptions' {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig True}
123-
}
103+
config :: SyncNodeConfig -> SyncNodeConfig
104+
config cfg =
105+
cfg {dncInsertOptions = (dncInsertOptions cfg) {sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig True}}

0 commit comments

Comments
 (0)