@@ -109,7 +109,6 @@ import Hydra.Logging (Tracer, traceWith)
109
109
import Hydra.Node.DepositPeriod (DepositPeriod (.. ))
110
110
import Hydra.Options (DirectChainConfig (.. ), startChainFrom )
111
111
import Hydra.Tx (HeadId , IsTx (balance ), Party , txId )
112
- import Hydra.Tx.ContestationPeriod (ContestationPeriod (UnsafeContestationPeriod ))
113
112
import Hydra.Tx.ContestationPeriod qualified as CP
114
113
import Hydra.Tx.Utils (dummyValidatorScript , verificationKeyToOnChainId )
115
114
import HydraNode (
@@ -179,7 +178,7 @@ oneOfThreeNodesStopsForAWhile tracer workDir cardanoNode hydraScriptsTxId = do
179
178
seedFromFaucet_ cardanoNode bobCardanoVk 100_000_000 (contramap FromFaucet tracer)
180
179
seedFromFaucet_ cardanoNode carolCardanoVk 100_000_000 (contramap FromFaucet tracer)
181
180
182
- let contestationPeriod = UnsafeContestationPeriod 1
181
+ let contestationPeriod = 1
183
182
aliceChainConfig <-
184
183
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [Bob , Carol ] contestationPeriod
185
184
<&> setNetworkId networkId
@@ -252,7 +251,7 @@ restartedNodeCanObserveCommitTx tracer workDir cardanoNode hydraScriptsTxId = do
252
251
seedFromFaucet_ cardanoNode aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
253
252
seedFromFaucet_ cardanoNode bobCardanoVk 100_000_000 (contramap FromFaucet tracer)
254
253
255
- let contestationPeriod = UnsafeContestationPeriod 1
254
+ let contestationPeriod = 1
256
255
aliceChainConfig <-
257
256
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [Bob ] contestationPeriod
258
257
<&> setNetworkId networkId
@@ -283,9 +282,8 @@ restartedNodeCanObserveCommitTx tracer workDir cardanoNode hydraScriptsTxId = do
283
282
restartedNodeCanAbort :: Tracer IO EndToEndLog -> FilePath -> RunningNode -> [TxId ] -> IO ()
284
283
restartedNodeCanAbort tracer workDir cardanoNode hydraScriptsTxId = do
285
284
refuelIfNeeded tracer cardanoNode Alice 100_000_000
286
- let contestationPeriod = UnsafeContestationPeriod 2
287
285
aliceChainConfig <-
288
- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
286
+ chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] 2
289
287
-- we delibelately do not start from a chain point here to highlight the
290
288
-- need for persistence
291
289
<&> modifyConfig (\ config -> config{networkId, startChainFrom = Nothing })
@@ -312,7 +310,7 @@ nodeReObservesOnChainTxs tracer workDir cardanoNode hydraScriptsTxId = do
312
310
refuelIfNeeded tracer cardanoNode Bob 100_000_000
313
311
-- Start hydra-node on chain tip
314
312
tip <- queryTip networkId nodeSocket
315
- let contestationPeriod = UnsafeContestationPeriod 2
313
+ let contestationPeriod = 2
316
314
aliceChainConfig <-
317
315
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [Bob ] contestationPeriod
318
316
<&> modifyConfig (\ config -> config{networkId, startChainFrom = Nothing })
@@ -504,7 +502,7 @@ singlePartyOpenAHead tracer workDir node hydraScriptsTxId callback =
504
502
refuelIfNeeded tracer node Alice 25_000_000
505
503
-- Start hydra-node on chain tip
506
504
tip <- queryTip networkId nodeSocket
507
- let contestationPeriod = UnsafeContestationPeriod 100
505
+ let contestationPeriod = 100
508
506
aliceChainConfig <-
509
507
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
510
508
<&> modifyConfig (\ config -> config{networkId, startChainFrom = Just tip})
@@ -544,7 +542,7 @@ singlePartyCommitsFromExternal tracer workDir node hydraScriptsTxId =
544
542
)
545
543
$ do
546
544
refuelIfNeeded tracer node Alice 25_000_000
547
- let contestationPeriod = UnsafeContestationPeriod 100
545
+ let contestationPeriod = 100
548
546
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
549
547
let hydraNodeId = 1
550
548
let hydraTracer = contramap FromHydraNode tracer
@@ -588,7 +586,7 @@ singlePartyUsesScriptOnL2 tracer workDir node hydraScriptsTxId =
588
586
)
589
587
$ do
590
588
refuelIfNeeded tracer node Alice 250_000_000
591
- let contestationPeriod = UnsafeContestationPeriod 1
589
+ let contestationPeriod = 1
592
590
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
593
591
let hydraNodeId = 1
594
592
let hydraTracer = contramap FromHydraNode tracer
@@ -707,7 +705,7 @@ singlePartyUsesWithdrawZeroTrick tracer workDir node hydraScriptsTxId =
707
705
(\ _ -> returnFundsToFaucet tracer node AliceFunds )
708
706
$ \ utxoToCommit -> do
709
707
-- Start hydra-node and open a head
710
- let contestationPeriod = UnsafeContestationPeriod 1
708
+ let contestationPeriod = 1
711
709
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
712
710
let hydraNodeId = 1
713
711
let hydraTracer = contramap FromHydraNode tracer
@@ -775,7 +773,7 @@ singlePartyCommitsScriptBlueprint ::
775
773
singlePartyCommitsScriptBlueprint tracer workDir node hydraScriptsTxId =
776
774
(`finally` returnFundsToFaucet tracer node Alice ) $ do
777
775
refuelIfNeeded tracer node Alice 20_000_000
778
- let contestationPeriod = UnsafeContestationPeriod 100
776
+ let contestationPeriod = 100
779
777
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
780
778
let hydraNodeId = 1
781
779
let hydraTracer = contramap FromHydraNode tracer
@@ -860,7 +858,7 @@ persistenceCanLoadWithEmptyCommit ::
860
858
persistenceCanLoadWithEmptyCommit tracer workDir node hydraScriptsTxId =
861
859
(`finally` returnFundsToFaucet tracer node Alice ) $ do
862
860
refuelIfNeeded tracer node Alice 20_000_000
863
- let contestationPeriod = UnsafeContestationPeriod 100
861
+ let contestationPeriod = 100
864
862
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
865
863
let hydraNodeId = 1
866
864
let hydraTracer = contramap FromHydraNode tracer
@@ -898,7 +896,7 @@ singlePartyCommitsFromExternalTxBlueprint ::
898
896
singlePartyCommitsFromExternalTxBlueprint tracer workDir node hydraScriptsTxId =
899
897
(`finally` returnFundsToFaucet tracer node Alice ) $ do
900
898
refuelIfNeeded tracer node Alice 20_000_000
901
- let contestationPeriod = UnsafeContestationPeriod 100
899
+ let contestationPeriod = 100
902
900
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
903
901
let hydraNodeId = 1
904
902
let hydraTracer = contramap FromHydraNode tracer
@@ -959,7 +957,7 @@ canCloseWithLongContestationPeriod tracer workDir node hydraScriptsTxId = do
959
957
refuelIfNeeded tracer node Alice 100_000_000
960
958
-- Start hydra-node on chain tip
961
959
tip <- queryTip networkId nodeSocket
962
- let oneWeek = UnsafeContestationPeriod ( 60 * 60 * 24 * 7 )
960
+ let oneWeek = 60 * 60 * 24 * 7
963
961
aliceChainConfig <-
964
962
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] oneWeek
965
963
<&> modifyConfig (\ config -> config{networkId, startChainFrom = Just tip})
@@ -995,7 +993,7 @@ canSubmitTransactionThroughAPI ::
995
993
canSubmitTransactionThroughAPI tracer workDir node hydraScriptsTxId =
996
994
(`finally` returnFundsToFaucet tracer node Alice ) $ do
997
995
refuelIfNeeded tracer node Alice 25_000_000
998
- let contestationPeriod = UnsafeContestationPeriod 100
996
+ let contestationPeriod = 100
999
997
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
1000
998
let hydraNodeId = 1
1001
999
let hydraTracer = contramap FromHydraNode tracer
@@ -1049,7 +1047,7 @@ threeNodesNoErrorsOnOpen tracer tmpDir node@RunningNode{nodeSocket} hydraScripts
1049
1047
let cardanoKeys = [aliceKeys, bobKeys, carolKeys]
1050
1048
hydraKeys = [aliceSk, bobSk, carolSk]
1051
1049
1052
- let contestationPeriod = UnsafeContestationPeriod 2
1050
+ let contestationPeriod = 2
1053
1051
let hydraTracer = contramap FromHydraNode tracer
1054
1052
withHydraCluster hydraTracer tmpDir nodeSocket 1 cardanoKeys hydraKeys hydraScriptsTxId contestationPeriod $ \ clients -> do
1055
1053
let leader = head clients
@@ -1089,7 +1087,7 @@ initWithWrongKeys workDir tracer node@RunningNode{nodeSocket} hydraScriptsTxId =
1089
1087
(aliceCardanoVk, _) <- keysFor Alice
1090
1088
(carolCardanoVk, _) <- keysFor Carol
1091
1089
1092
- let contestationPeriod = UnsafeContestationPeriod 2
1090
+ let contestationPeriod = 2
1093
1091
aliceChainConfig <- chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [Carol ] contestationPeriod
1094
1092
bobChainConfig <- chainConfigFor Bob workDir nodeSocket hydraScriptsTxId [Alice ] contestationPeriod
1095
1093
@@ -1123,7 +1121,7 @@ canCommit tracer workDir node hydraScriptsTxId =
1123
1121
(`finally` returnFundsToFaucet tracer node Bob ) $ do
1124
1122
refuelIfNeeded tracer node Alice 30_000_000
1125
1123
refuelIfNeeded tracer node Bob 30_000_000
1126
- let contestationPeriod = UnsafeContestationPeriod 20
1124
+ let contestationPeriod = 20
1127
1125
aliceChainConfig <-
1128
1126
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [Bob ] contestationPeriod
1129
1127
<&> setNetworkId networkId
@@ -1391,7 +1389,7 @@ canDecommit :: Tracer IO EndToEndLog -> FilePath -> RunningNode -> [TxId] -> IO
1391
1389
canDecommit tracer workDir node hydraScriptsTxId =
1392
1390
(`finally` returnFundsToFaucet tracer node Alice ) $ do
1393
1391
refuelIfNeeded tracer node Alice 30_000_000
1394
- let contestationPeriod = UnsafeContestationPeriod 1
1392
+ let contestationPeriod = 1
1395
1393
aliceChainConfig <-
1396
1394
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [] contestationPeriod
1397
1395
<&> setNetworkId networkId
@@ -1493,7 +1491,7 @@ canSideLoadSnapshot tracer workDir cardanoNode hydraScriptsTxId = do
1493
1491
seedFromFaucet_ cardanoNode bobCardanoVk 100_000_000 (contramap FromFaucet tracer)
1494
1492
seedFromFaucet_ cardanoNode carolCardanoVk 100_000_000 (contramap FromFaucet tracer)
1495
1493
1496
- let contestationPeriod = UnsafeContestationPeriod 1
1494
+ let contestationPeriod = 1
1497
1495
aliceChainConfig <-
1498
1496
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [Bob , Carol ] contestationPeriod
1499
1497
<&> setNetworkId networkId
@@ -1617,7 +1615,7 @@ threeNodesWithMirrorParty tracer workDir cardanoNode@RunningNode{nodeSocket, net
1617
1615
seedFromFaucet_ cardanoNode aliceCardanoVk 100_000_000 (contramap FromFaucet tracer)
1618
1616
seedFromFaucet_ cardanoNode bobCardanoVk 100_000_000 (contramap FromFaucet tracer)
1619
1617
1620
- let contestationPeriod = UnsafeContestationPeriod 1
1618
+ let contestationPeriod = 1
1621
1619
aliceChainConfig <-
1622
1620
chainConfigFor Alice workDir nodeSocket hydraScriptsTxId [Bob ] contestationPeriod
1623
1621
<&> setNetworkId networkId
0 commit comments