@@ -18,10 +18,10 @@ import Test.Tasty.HUnit (Assertion ())
18
18
19
19
configRemoveJsonbFromSchemaEnabled :: IOManager -> [(Text , Text )] -> Assertion
20
20
configRemoveJsonbFromSchemaEnabled ioManager metadata = do
21
- syncNodeConfig <- mksNodeConfig
21
+ syncNodeConfig <- mkCustomSyncNodeConfig cfgDir args config
22
22
withCustomConfigAndDropDB args (Just syncNodeConfig) cfgDir testLabel action ioManager metadata
23
23
where
24
- action = \ _interpreter _mockServer dbSync -> do
24
+ action _interpreter _mockServer dbSync = do
25
25
startDBSync dbSync
26
26
threadDelay 7_000_000
27
27
assertEqQuery
@@ -36,21 +36,16 @@ configRemoveJsonbFromSchemaEnabled ioManager metadata = do
36
36
37
37
cfgDir = conwayConfigDir
38
38
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 }}
47
42
48
43
configRemoveJsonbFromSchemaDisabled :: IOManager -> [(Text , Text )] -> Assertion
49
44
configRemoveJsonbFromSchemaDisabled ioManager metadata = do
50
- syncNodeConfig <- mksNodeConfig
45
+ syncNodeConfig <- mkCustomSyncNodeConfig cfgDir args config
51
46
withCustomConfigAndDropDB args (Just syncNodeConfig) cfgDir testLabel action ioManager metadata
52
47
where
53
- action = \ _interpreter _mockServer dbSync -> do
48
+ action _interpreter _mockServer dbSync = do
54
49
startDBSync dbSync
55
50
threadDelay 7_000_000
56
51
assertEqQuery
@@ -62,62 +57,49 @@ configRemoveJsonbFromSchemaDisabled ioManager metadata = do
62
57
63
58
args = initCommandLineArgs {claFullMode = False }
64
59
testLabel = " conwayConfigRemoveJsonbFromSchemaDisabled"
65
-
66
60
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 }}
76
64
77
65
configJsonbInSchemaShouldRemoveThenAdd :: IOManager -> [(Text , Text )] -> Assertion
78
66
configJsonbInSchemaShouldRemoveThenAdd ioManager metadata = do
79
- syncNodeConfig <- mksNodeConfig
67
+ syncNodeConfig <- mkCustomSyncNodeConfig cfgDir args config
80
68
withCustomConfigAndDropDB args (Just syncNodeConfig) cfgDir testLabel action ioManager metadata
81
69
where
82
- action = \ _interpreter _mockServer dbSync -> do
83
- startDBSync dbSync
70
+ action _interpreter _mockServer dbSyncEnv = do
71
+ startDBSync dbSyncEnv
84
72
threadDelay 7_000_000
85
73
assertEqQuery
86
- dbSync
74
+ dbSyncEnv
87
75
DB. queryJsonbInSchemaExists
88
76
False
89
77
" There should be no jsonb types in database if option has been enabled"
90
- stopDBSync dbSync
78
+ stopDBSync dbSyncEnv
91
79
let newDbSyncEnv =
92
- dbSync
80
+ dbSyncEnv
93
81
{ dbSyncConfig =
94
- (dbSyncConfig dbSync )
82
+ (dbSyncConfig dbSyncEnv )
95
83
{ dncInsertOptions =
96
- (dncInsertOptions $ dbSyncConfig dbSync )
84
+ (dncInsertOptions $ dbSyncConfig dbSyncEnv )
97
85
{ sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
98
86
}
99
87
}
100
88
}
101
89
startDBSync newDbSyncEnv
102
90
threadDelay 7_000_000
103
91
assertEqQuery
104
- dbSync
92
+ dbSyncEnv
105
93
DB. queryJsonbInSchemaExists
106
94
True
107
95
" There should be jsonb types in database if option has been disabled"
108
96
-- Expected to fail
109
- checkStillRuns dbSync
97
+ checkStillRuns dbSyncEnv
110
98
111
99
args = initCommandLineArgs {claFullMode = False }
112
100
testLabel = " configJsonbInSchemaShouldRemoveThenAdd"
113
-
114
101
cfgDir = conwayConfigDir
115
102
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