Skip to content

Commit 0c4fffa

Browse files
CmdvCmdv
authored
Merge pull request #1989 from IntersectMBO/#1938-1-Variant-Name-Change
1938 - 1 - Variant/Tests Name Changes
2 parents 91d11f6 + 9a8f8b2 commit 0c4fffa

Some content is hidden

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

66 files changed

+777
-794
lines changed

‎.github/workflows/check-fourmolu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
shell: bash
1414

1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717

1818
- name: Run fourmolu
19-
uses: haskell-actions/run-fourmolu@v9
19+
uses: haskell-actions/run-fourmolu@v11
2020
with:
21-
version: "0.10.1.0"
21+
version: "0.17.0.0"

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ module Test.Cardano.Db.Mock.Config (
5050
startDBSync,
5151
withDBSyncEnv,
5252
withFullConfig,
53-
withFullConfigAndDropDB,
54-
withFullConfigAndLogs,
55-
withCustomConfigAndLogsAndDropDB,
53+
withFullConfigDropDB,
54+
withFullConfigLog,
55+
withCustomConfigDropDBLog,
5656
withCustomConfig,
57-
withCustomConfigAndDropDB,
58-
withCustomConfigAndLogs,
57+
withCustomConfigDropDB,
58+
withCustomConfigLog,
5959
withFullConfig',
6060
replaceConfigFile,
61-
txOutTableTypeFromConfig,
61+
txOutVariantTypeFromConfig,
6262
) where
6363

6464
import Cardano.Api (NetworkMagic (..))
@@ -401,7 +401,7 @@ withFullConfig =
401401
Nothing
402402

403403
-- this function needs to be used where the schema needs to be rebuilt
404-
withFullConfigAndDropDB ::
404+
withFullConfigDropDB ::
405405
-- | config filepath
406406
FilePath ->
407407
-- | test label
@@ -410,7 +410,7 @@ withFullConfigAndDropDB ::
410410
IOManager ->
411411
[(Text, Text)] ->
412412
IO a
413-
withFullConfigAndDropDB =
413+
withFullConfigDropDB =
414414
withFullConfig'
415415
( WithConfigArgs
416416
{ hasFingerprint = True
@@ -421,7 +421,7 @@ withFullConfigAndDropDB =
421421
initCommandLineArgs
422422
Nothing
423423

424-
withFullConfigAndLogs ::
424+
withFullConfigLog ::
425425
-- | config filepath
426426
FilePath ->
427427
-- | test label
@@ -430,7 +430,7 @@ withFullConfigAndLogs ::
430430
IOManager ->
431431
[(Text, Text)] ->
432432
IO a
433-
withFullConfigAndLogs =
433+
withFullConfigLog =
434434
withFullConfig'
435435
( WithConfigArgs
436436
{ hasFingerprint = True
@@ -462,7 +462,7 @@ withCustomConfig =
462462
}
463463
)
464464

465-
withCustomConfigAndDropDB ::
465+
withCustomConfigDropDB ::
466466
CommandLineArgs ->
467467
-- | custom SyncNodeConfig
468468
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
@@ -474,7 +474,7 @@ withCustomConfigAndDropDB ::
474474
IOManager ->
475475
[(Text, Text)] ->
476476
IO a
477-
withCustomConfigAndDropDB =
477+
withCustomConfigDropDB =
478478
withFullConfig'
479479
( WithConfigArgs
480480
{ hasFingerprint = True
@@ -484,7 +484,7 @@ withCustomConfigAndDropDB =
484484
)
485485

486486
-- This is a usefull function to be able to see logs from DBSync when writing/debuging tests
487-
withCustomConfigAndLogs ::
487+
withCustomConfigLog ::
488488
CommandLineArgs ->
489489
-- | custom SyncNodeConfig
490490
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
@@ -496,7 +496,7 @@ withCustomConfigAndLogs ::
496496
IOManager ->
497497
[(Text, Text)] ->
498498
IO a
499-
withCustomConfigAndLogs =
499+
withCustomConfigLog =
500500
withFullConfig'
501501
( WithConfigArgs
502502
{ hasFingerprint = True
@@ -505,7 +505,7 @@ withCustomConfigAndLogs =
505505
}
506506
)
507507

508-
withCustomConfigAndLogsAndDropDB ::
508+
withCustomConfigDropDBLog ::
509509
CommandLineArgs ->
510510
-- | custom SyncNodeConfig
511511
Maybe (SyncNodeConfig -> SyncNodeConfig) ->
@@ -517,7 +517,7 @@ withCustomConfigAndLogsAndDropDB ::
517517
IOManager ->
518518
[(Text, Text)] ->
519519
IO a
520-
withCustomConfigAndLogsAndDropDB =
520+
withCustomConfigDropDBLog =
521521
withFullConfig'
522522
( WithConfigArgs
523523
{ hasFingerprint = True
@@ -604,14 +604,14 @@ replaceConfigFile newFilename dbSync@DBSyncEnv {..} = do
604604
newParams =
605605
dbSyncParams {enpConfigFile = ConfigFile $ configDir </> newFilename}
606606

607-
txOutTableTypeFromConfig :: DBSyncEnv -> DB.TxOutTableType
608-
txOutTableTypeFromConfig dbSyncEnv =
607+
txOutVariantTypeFromConfig :: DBSyncEnv -> DB.TxOutVariantType
608+
txOutVariantTypeFromConfig dbSyncEnv =
609609
case sioTxOut $ dncInsertOptions $ dbSyncConfig dbSyncEnv of
610-
TxOutDisable -> DB.TxOutCore
610+
TxOutDisable -> DB.TxOutVariantCore
611611
TxOutEnable useTxOutAddress -> getTxOutTT useTxOutAddress
612612
TxOutConsumed _ useTxOutAddress -> getTxOutTT useTxOutAddress
613613
TxOutConsumedPrune _ useTxOutAddress -> getTxOutTT useTxOutAddress
614614
TxOutConsumedBootstrap _ useTxOutAddress -> getTxOutTT useTxOutAddress
615615
where
616-
getTxOutTT :: UseTxOutAddress -> DB.TxOutTableType
617-
getTxOutTT value = if unUseTxOutAddress value then DB.TxOutVariantAddress else DB.TxOutCore
616+
getTxOutTT :: UseTxOutAddress -> DB.TxOutVariantType
617+
getTxOutTT value = if unUseTxOutAddress value then DB.TxOutVariantAddress else DB.TxOutVariantCore

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import Control.Concurrent.Class.MonadSTM.Strict (MonadSTM (atomically))
1212
import Control.Monad (void)
1313
import Data.Text (Text)
1414
import Ouroboros.Network.Block (blockNo)
15-
import Test.Cardano.Db.Mock.Config (alonzoConfigDir, startDBSync, stopDBSync, withFullConfig, withFullConfigAndDropDB)
15+
import Test.Cardano.Db.Mock.Config (alonzoConfigDir, startDBSync, stopDBSync, withFullConfig, withFullConfigDropDB)
1616
import Test.Cardano.Db.Mock.Examples (mockBlock0, mockBlock1, mockBlock2)
1717
import Test.Cardano.Db.Mock.UnifiedApi (forgeNextAndSubmit)
1818
import Test.Cardano.Db.Mock.Validate (assertBlockNoBackoff)
1919
import Test.Tasty.HUnit (Assertion, assertBool)
2020

2121
forgeBlocks :: IOManager -> [(Text, Text)] -> Assertion
2222
forgeBlocks = do
23-
withFullConfigAndDropDB alonzoConfigDir testLabel $ \interpreter _mockServer _dbSync -> do
23+
withFullConfigDropDB alonzoConfigDir testLabel $ \interpreter _mockServer _dbSync -> do
2424
_block0 <- forgeNext interpreter mockBlock0
2525
_block1 <- forgeNext interpreter mockBlock1
2626
block2 <- forgeNext interpreter mockBlock2

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Test.Cardano.Db.Mock.Config (
1818
alonzoConfigDir,
1919
startDBSync,
2020
withFullConfig,
21-
withFullConfigAndDropDB,
21+
withFullConfigDropDB,
2222
)
2323
import Test.Cardano.Db.Mock.UnifiedApi (
2424
withAlonzoFindLeaderAndSubmit,
@@ -29,7 +29,7 @@ import Test.Tasty.HUnit (Assertion)
2929

3030
addSimpleTx :: IOManager -> [(Text, Text)] -> Assertion
3131
addSimpleTx =
32-
withFullConfigAndDropDB alonzoConfigDir testLabel $ \interpreter mockServer dbSync -> do
32+
withFullConfigDropDB alonzoConfigDir testLabel $ \interpreter mockServer dbSync -> do
3333
-- translate the block to a real Cardano block.
3434
void $
3535
withAlonzoFindLeaderAndSubmitTx interpreter mockServer $

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import Control.Monad (forM_, void)
3434
import qualified Data.Map as Map
3535
import Data.Text (Text)
3636
import Ouroboros.Network.Block (blockPoint)
37-
import Test.Cardano.Db.Mock.Config (babbageConfigDir, startDBSync, stopDBSync, withFullConfig, withFullConfigAndDropDB)
37+
import Test.Cardano.Db.Mock.Config (babbageConfigDir, startDBSync, stopDBSync, withFullConfig, withFullConfigDropDB)
3838
import Test.Cardano.Db.Mock.UnifiedApi (
3939
fillEpochPercentage,
4040
fillEpochs,
@@ -59,7 +59,7 @@ import Test.Tasty.HUnit (Assertion)
5959

6060
simpleRewards :: IOManager -> [(Text, Text)] -> Assertion
6161
simpleRewards =
62-
withFullConfigAndDropDB babbageConfigDir testLabel $ \interpreter mockServer dbSync -> do
62+
withFullConfigDropDB babbageConfigDir testLabel $ \interpreter mockServer dbSync -> do
6363
startDBSync dbSync
6464
void $ registerAllStakeCreds interpreter mockServer
6565

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ import Control.Concurrent.Class.MonadSTM.Strict (atomically)
1414
import Control.Monad (void)
1515
import Data.Text (Text)
1616
import Ouroboros.Network.Block (blockNo)
17-
import Test.Cardano.Db.Mock.Config (babbageConfigDir, startDBSync, stopDBSync, withFullConfig, withFullConfigAndDropDB)
17+
import Test.Cardano.Db.Mock.Config (babbageConfigDir, startDBSync, stopDBSync, withFullConfig, withFullConfigDropDB)
1818
import Test.Cardano.Db.Mock.Examples (mockBlock0, mockBlock1, mockBlock2)
1919
import Test.Cardano.Db.Mock.UnifiedApi (fillUntilNextEpoch, forgeAndSubmitBlocks, forgeNextAndSubmit)
2020
import Test.Cardano.Db.Mock.Validate (assertBlockNoBackoff)
2121
import Test.Tasty.HUnit (Assertion, assertBool)
2222

2323
forgeBlocks :: IOManager -> [(Text, Text)] -> Assertion
2424
forgeBlocks = do
25-
withFullConfigAndDropDB babbageConfigDir testLabel $ \interpreter _mockServer _dbSync -> do
25+
withFullConfigDropDB babbageConfigDir testLabel $ \interpreter _mockServer _dbSync -> do
2626
_block0 <- forgeNext interpreter mockBlock0
2727
_block1 <- forgeNext interpreter mockBlock1
2828
block2 <- forgeNext interpreter mockBlock2

‎cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/CommandLineArg/EpochDisabled.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Prelude ()
1818

1919
checkEpochDisabledArg :: IOManager -> [(Text, Text)] -> Assertion
2020
checkEpochDisabledArg =
21-
withCustomConfigAndDropDB cliArgs Nothing conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
21+
withCustomConfigDropDB cliArgs Nothing conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
2222
startDBSync dbSync
2323

2424
-- Forge some blocks

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

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

1919
configRemoveJsonbFromSchemaEnabled :: IOManager -> [(Text, Text)] -> Assertion
2020
configRemoveJsonbFromSchemaEnabled = do
21-
withCustomConfigAndDropDB args (Just configRemoveJsonFromSchema) cfgDir testLabel $ \_interpreter _mockServer dbSync -> do
21+
withCustomConfigDropDB args (Just configRemoveJsonFromSchema) cfgDir testLabel $ \_interpreter _mockServer dbSync -> do
2222
startDBSync dbSync
2323
threadDelay 7_000_000
2424
assertEqQuery
@@ -35,7 +35,7 @@ configRemoveJsonbFromSchemaEnabled = do
3535

3636
configRemoveJsonbFromSchemaDisabled :: IOManager -> [(Text, Text)] -> Assertion
3737
configRemoveJsonbFromSchemaDisabled = do
38-
withCustomConfigAndDropDB args (Just configRemoveJsonFromSchemaFalse) cfgDir testLabel $
38+
withCustomConfigDropDB args (Just configRemoveJsonFromSchemaFalse) cfgDir testLabel $
3939
\_interpreter _mockServer dbSync -> do
4040
startDBSync dbSync
4141
threadDelay 7_000_000
@@ -52,7 +52,7 @@ configRemoveJsonbFromSchemaDisabled = do
5252

5353
configJsonbInSchemaShouldRemoveThenAdd :: IOManager -> [(Text, Text)] -> Assertion
5454
configJsonbInSchemaShouldRemoveThenAdd =
55-
withCustomConfigAndDropDB args (Just configRemoveJsonFromSchema) cfgDir testLabel $ \_interpreter _mockServer dbSyncEnv -> do
55+
withCustomConfigDropDB args (Just configRemoveJsonFromSchema) cfgDir testLabel $ \_interpreter _mockServer dbSyncEnv -> do
5656
startDBSync dbSyncEnv
5757
threadDelay 7_000_000
5858
assertEqQuery

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ basicPruneWithAddress = performBasicPrune True
5858

5959
performBasicPrune :: Bool -> IOManager -> [(Text, Text)] -> Assertion
6060
performBasicPrune useTxOutAddress = do
61-
withCustomConfigAndDropDB args (Just $ configPruneForceTxIn useTxOutAddress) cfgDir testLabel $ \interpreter mockServer dbSync -> do
61+
withCustomConfigDropDB args (Just $ configPruneForceTxIn useTxOutAddress) cfgDir testLabel $ \interpreter mockServer dbSync -> do
6262
startDBSync dbSync
63-
let txOutTableType = txOutTableTypeFromConfig dbSync
63+
let txOutTableType = txOutVariantTypeFromConfig dbSync
6464

6565
-- Add some blocks
6666
blks <- forgeAndSubmitBlocks interpreter mockServer 50
@@ -98,8 +98,8 @@ pruneWithSimpleRollbackWithAddress = performPruneWithSimpleRollback True
9898

9999
performPruneWithSimpleRollback :: Bool -> IOManager -> [(Text, Text)] -> Assertion
100100
performPruneWithSimpleRollback useTxOutAddress =
101-
withCustomConfigAndDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
102-
let txOutTableType = txOutTableTypeFromConfig dbSync
101+
withCustomConfigDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
102+
let txOutTableType = txOutVariantTypeFromConfig dbSync
103103
-- Forge some blocks
104104
blk0 <- forgeNext interpreter mockBlock0
105105
blk1 <- forgeNext interpreter mockBlock1
@@ -141,9 +141,9 @@ pruneWithFullTxRollbackWithAddress = performPruneWithFullTxRollback True
141141

142142
performPruneWithFullTxRollback :: Bool -> IOManager -> [(Text, Text)] -> Assertion
143143
performPruneWithFullTxRollback useTxOutAddress =
144-
withCustomConfigAndDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
144+
withCustomConfigDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
145145
startDBSync dbSync
146-
let txOutTableType = txOutTableTypeFromConfig dbSync
146+
let txOutTableType = txOutVariantTypeFromConfig dbSync
147147
-- Forge a block
148148
blk0 <- forgeNextFindLeaderAndSubmit interpreter mockServer []
149149
-- Add some transactions
@@ -186,9 +186,9 @@ pruningShouldKeepSomeTxWithAddress = performPruningShouldKeepSomeTx True
186186

187187
performPruningShouldKeepSomeTx :: Bool -> IOManager -> [(Text, Text)] -> Assertion
188188
performPruningShouldKeepSomeTx useTxOutAddress = do
189-
withCustomConfigAndDropDB cmdLineArgs (Just $ configPrune useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
189+
withCustomConfigDropDB cmdLineArgs (Just $ configPrune useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
190190
startDBSync dbSync
191-
let txOutTableType = txOutTableTypeFromConfig dbSync
191+
let txOutTableType = txOutVariantTypeFromConfig dbSync
192192
-- Forge some blocks
193193
blk1 <- forgeAndSubmitBlocks interpreter mockServer 80
194194
-- These two blocks/transactions will fall within the last (2 * securityParam) 20
@@ -222,10 +222,10 @@ pruneAndRollBackOneBlockWithAddress = performPruneAndRollBackOneBlock True
222222

223223
performPruneAndRollBackOneBlock :: Bool -> IOManager -> [(Text, Text)] -> Assertion
224224
performPruneAndRollBackOneBlock useTxOutAddress =
225-
withCustomConfigAndDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
225+
withCustomConfigDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
226226
startDBSync dbSync
227227

228-
let txOutTableType = txOutTableTypeFromConfig dbSync
228+
let txOutTableType = txOutVariantTypeFromConfig dbSync
229229
-- Forge some blocks
230230
void $ forgeAndSubmitBlocks interpreter mockServer 98
231231
-- These transactions will fall within the last (2 * securityParam) 20
@@ -268,10 +268,10 @@ noPruneAndRollBackWithAddress = performNoPruneAndRollBack True
268268

269269
performNoPruneAndRollBack :: Bool -> IOManager -> [(Text, Text)] -> Assertion
270270
performNoPruneAndRollBack useTxOutAddress =
271-
withCustomConfigAndDropDB cmdLineArgs (Just $ configConsume useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
271+
withCustomConfigDropDB cmdLineArgs (Just $ configConsume useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
272272
startDBSync dbSync
273273

274-
let txOutTableType = txOutTableTypeFromConfig dbSync
274+
let txOutTableType = txOutVariantTypeFromConfig dbSync
275275
-- Forge some blocks
276276
void $ forgeAndSubmitBlocks interpreter mockServer 98
277277
-- Add a block with transactions
@@ -314,10 +314,10 @@ pruneSameBlockWithAddress = performPruneSameBlock True
314314

315315
performPruneSameBlock :: Bool -> IOManager -> [(Text, Text)] -> Assertion
316316
performPruneSameBlock useTxOutAddress =
317-
withCustomConfigAndDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
317+
withCustomConfigDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
318318
startDBSync dbSync
319319

320-
let txOutTableType = txOutTableTypeFromConfig dbSync
320+
let txOutTableType = txOutVariantTypeFromConfig dbSync
321321
-- Forge some blocks
322322
void $ forgeAndSubmitBlocks interpreter mockServer 76
323323
blk77 <- forgeNextFindLeaderAndSubmit interpreter mockServer []
@@ -357,7 +357,7 @@ noPruneSameBlockWithAddress = performNoPruneSameBlock True
357357

358358
performNoPruneSameBlock :: Bool -> IOManager -> [(Text, Text)] -> Assertion
359359
performNoPruneSameBlock useTxOutAddress =
360-
withCustomConfigAndDropDB cmdLineArgs (Just $ configConsume useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
360+
withCustomConfigDropDB cmdLineArgs (Just $ configConsume useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
361361
startDBSync dbSync
362362

363363
-- Forge some blocks
@@ -382,7 +382,7 @@ performNoPruneSameBlock useTxOutAddress =
382382
void $ forgeNextFindLeaderAndSubmit interpreter mockServer []
383383
-- Verify everything was pruned
384384
assertBlockNoBackoff dbSync 98
385-
assertEqQuery dbSync (DB.queryTxOutConsumedCount $ txOutTableTypeFromConfig dbSync) 0 "Unexpected TxOutConsumedByTxId after rollback"
385+
assertEqQuery dbSync (DB.queryTxOutConsumedCount $ txOutVariantTypeFromConfig dbSync) 0 "Unexpected TxOutConsumedByTxId after rollback"
386386
where
387387
cmdLineArgs = initCommandLineArgs
388388
testLabel = "conwayConfigNoPruneSameBlock"
@@ -395,7 +395,7 @@ migrateAndPruneRestartWithAddress = performMigrateAndPruneRestart True
395395

396396
performMigrateAndPruneRestart :: Bool -> IOManager -> [(Text, Text)] -> Assertion
397397
performMigrateAndPruneRestart useTxOutAddress =
398-
withCustomConfigAndDropDB cmdLineArgs (Just $ configConsume useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
398+
withCustomConfigDropDB cmdLineArgs (Just $ configConsume useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
399399
startDBSync dbSync
400400

401401
-- Forge some blocks
@@ -424,7 +424,7 @@ pruneRestartMissingFlagWithAddress = performPruneRestartMissingFlag True
424424

425425
performPruneRestartMissingFlag :: Bool -> IOManager -> [(Text, Text)] -> Assertion
426426
performPruneRestartMissingFlag useTxOutAddress =
427-
withCustomConfigAndDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
427+
withCustomConfigDropDB cmdLineArgs (Just $ configPruneForceTxIn useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
428428
startDBSync dbSync
429429

430430
-- Forge some blocks
@@ -453,7 +453,7 @@ bootstrapRestartMissingFlagWithAddress = performBootstrapRestartMissingFlag True
453453

454454
performBootstrapRestartMissingFlag :: Bool -> IOManager -> [(Text, Text)] -> Assertion
455455
performBootstrapRestartMissingFlag useTxOutAddress =
456-
withCustomConfigAndDropDB cmdLineArgs (Just $ configBootstrap useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
456+
withCustomConfigDropDB cmdLineArgs (Just $ configBootstrap useTxOutAddress) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
457457
startDBSync dbSync
458458

459459
-- Forge some blocks
@@ -476,7 +476,7 @@ performBootstrapRestartMissingFlag useTxOutAddress =
476476

477477
populateDbRestartWithAddressConfig :: IOManager -> [(Text, Text)] -> Assertion
478478
populateDbRestartWithAddressConfig =
479-
withCustomConfigAndDropDB cmdLineArgs (Just $ configConsume False) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
479+
withCustomConfigDropDB cmdLineArgs (Just $ configConsume False) conwayConfigDir testLabel $ \interpreter mockServer dbSync -> do
480480
startDBSync dbSync
481481

482482
-- Forge some blocks

0 commit comments

Comments
 (0)