@@ -68,7 +68,6 @@ import Hydra.Cluster.Fixture (
68
68
bob ,
69
69
carol ,
70
70
cperiod ,
71
- ddeadline ,
72
71
)
73
72
import Hydra.Cluster.Util (chainConfigFor , keysFor , modifyConfig , readConfigFile )
74
73
import Hydra.Ledger.Cardano (Tx )
@@ -105,10 +104,10 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
105
104
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
106
105
hydraScriptsTxId <- publishHydraScriptsAs node Faucet
107
106
-- Alice setup
108
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [Bob , Carol ] cperiod ddeadline
107
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [Bob , Carol ] cperiod
109
108
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $ \ aliceChain@ DirectChainTest {postTx} -> do
110
109
-- Bob setup
111
- bobChainConfig <- chainConfigFor Bob tmp nodeSocket hydraScriptsTxId [Alice , Carol ] cperiod ddeadline
110
+ bobChainConfig <- chainConfigFor Bob tmp nodeSocket hydraScriptsTxId [Alice , Carol ] cperiod
112
111
withDirectChainTest nullTracer bobChainConfig bob $ \ bobChain@ DirectChainTest {} -> do
113
112
-- Scenario
114
113
participants <- loadParticipants [Alice , Bob , Carol ]
@@ -131,11 +130,11 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
131
130
-- Alice setup
132
131
(aliceCardanoVk, _) <- keysFor Alice
133
132
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
134
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [Bob , Carol ] cperiod ddeadline
133
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [Bob , Carol ] cperiod
135
134
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
136
135
\ aliceChain@ DirectChainTest {postTx} -> do
137
136
-- Bob setup
138
- bobChainConfig <- chainConfigFor Bob tmp nodeSocket hydraScriptsTxId [Alice , Carol ] cperiod ddeadline
137
+ bobChainConfig <- chainConfigFor Bob tmp nodeSocket hydraScriptsTxId [Alice , Carol ] cperiod
139
138
withDirectChainTest (contramap (FromDirectChain " bob" ) tracer) bobChainConfig bob $
140
139
\ bobChain@ DirectChainTest {} -> do
141
140
-- Scenario
@@ -178,14 +177,14 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
178
177
-- Alice setup
179
178
(aliceCardanoVk, _) <- keysFor Alice
180
179
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
181
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
180
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
182
181
183
182
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
184
183
\ aliceChain@ DirectChainTest {postTx = alicePostTx} -> do
185
184
-- Bob setup
186
185
(bobCardanoVk, _) <- keysFor Bob
187
186
seedFromFaucet_ node bobCardanoVk 100_000_000 (contramap FromFaucet tracer)
188
- bobChainConfig <- chainConfigFor Bob tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
187
+ bobChainConfig <- chainConfigFor Bob tmp nodeSocket hydraScriptsTxId [] cperiod
189
188
190
189
withDirectChainTest nullTracer bobChainConfig bob $
191
190
\ bobChain@ DirectChainTest {postTx = bobPostTx} -> do
@@ -213,7 +212,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
213
212
-- Alice setup
214
213
(aliceCardanoVk, _) <- keysFor Alice
215
214
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
216
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
215
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
217
216
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
218
217
\ aliceChain@ DirectChainTest {postTx} -> do
219
218
participants <- loadParticipants [Alice ]
@@ -234,7 +233,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
234
233
-- Alice setup
235
234
(aliceCardanoVk, aliceCardanoSk) <- keysFor Alice
236
235
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
237
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
236
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
238
237
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
239
238
\ aliceChain@ DirectChainTest {postTx} -> do
240
239
participants <- loadParticipants [Alice ]
@@ -254,7 +253,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
254
253
-- Alice setup
255
254
(aliceCardanoVk, _) <- keysFor Alice
256
255
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
257
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
256
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
258
257
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
259
258
\ aliceChain@ DirectChainTest {postTx} -> do
260
259
-- Scenario
@@ -274,7 +273,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
274
273
-- Alice setup
275
274
(aliceCardanoVk, _) <- keysFor Alice
276
275
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
277
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
276
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
278
277
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
279
278
\ aliceChain@ DirectChainTest {postTx} -> do
280
279
-- Scenario
@@ -306,7 +305,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
306
305
-- Alice setup
307
306
(aliceCardanoVk, _) <- keysFor Alice
308
307
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
309
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
308
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
310
309
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
311
310
\ aliceChain@ DirectChainTest {postTx} -> do
312
311
-- Scenario
@@ -382,7 +381,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
382
381
(aliceCardanoVk, _) <- keysFor Alice
383
382
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
384
383
-- Alice setup
385
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
384
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
386
385
participants <- loadParticipants [Alice ]
387
386
let headParameters = HeadParameters cperiod [alice]
388
387
-- Scenario
@@ -410,7 +409,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
410
409
let headerHash = fromString (replicate 64 ' 0' )
411
410
let fakeTip = ChainPoint 42 headerHash
412
411
aliceChainConfig <-
413
- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
412
+ chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
414
413
<&> modifyConfig (\ cfg -> cfg{startChainFrom = Just fakeTip})
415
414
let action = withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $ \ _ ->
416
415
threadDelay 5 >> fail " should not execute main action but did?"
@@ -445,7 +444,7 @@ spec = around (showLogsOnFailure "DirectChainSpec") $ do
445
444
-- Alice setup
446
445
(aliceCardanoVk, _) <- keysFor Alice
447
446
seedFromFaucet_ node aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
448
- aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod ddeadline
447
+ aliceChainConfig <- chainConfigFor Alice tmp nodeSocket hydraScriptsTxId [] cperiod
449
448
withDirectChainTest (contramap (FromDirectChain " alice" ) tracer) aliceChainConfig alice $
450
449
\ aliceChain@ DirectChainTest {postTx} -> do
451
450
(aliceExternalVk, aliceExternalSk) <- generate genKeyPair
0 commit comments