Only test peers connected in etcd test

Author: locallycompact

hydra-cluster/src/Hydra/Cluster/Scenarios.hs

@@ -1096,13 +1096,13 @@ threeNodesNoErrorsOnOpen tracer tmpDir node@RunningNode{nodeSocket} hydraScripts
       Right _headIsOpen ->
         pure ()
 
--- | Hydra nodes ABC run and connect to each other.
--- Hydra nodes ABC shut down.
--- Hydra nodes AB run and connect to each other.
--- Hydra nodes AB shut down.
--- Hydra nodes ABC run and connect to each other.
+-- | Hydra nodes ABC run on ABC cluster and connect to each other.
+-- Hydra nodes BC shut down.
+-- Hydra nodes BC run on BC cluster and connect to each other.
+-- Hydra nodes BC shut down.
+-- Hydra nodes BC run and connect ABC cluster again.
 nodeCanSupportMultipleEtcdClusters :: Tracer IO EndToEndLog -> FilePath -> RunningNode -> [TxId] -> IO ()
-nodeCanSupportMultipleEtcdClusters tracer workDir node@RunningNode{blockTime, networkId, nodeSocket} hydraScriptsTxId = do
+nodeCanSupportMultipleEtcdClusters tracer workDir RunningNode{networkId, nodeSocket} hydraScriptsTxId = do
   let contestationPeriod = UnsafeContestationPeriod 2
   let depositDeadline = UnsafeDepositDeadline 50
 
@@ -1121,37 +1121,22 @@ nodeCanSupportMultipleEtcdClusters tracer workDir node@RunningNode{blockTime, ne
   withHydraNode hydraTracer aliceChainConfig workDir 1 aliceSk [bobVk, carolVk] [1, 2, 3] $ \n1 -> do
     withHydraNode hydraTracer bobChainConfig workDir 2 bobSk [aliceVk, carolVk] [1, 2, 3] $ \n2 -> do
       withHydraNode hydraTracer carolChainConfig workDir 3 carolSk [aliceVk, bobVk] [1, 2, 3] $ \n3 -> do
-        send n1 $ input "Init" []
-        headId <- waitMatch (20 * blockTime) n1 $ headIsInitializingWith (Set.fromList [alice, bob, carol])
-
-        requestCommitTx n1 mempty >>= submitTx node
-        requestCommitTx n2 mempty >>= submitTx node
-        requestCommitTx n3 mempty >>= submitTx node
-
-        waitFor hydraTracer (20 * blockTime) [n1, n2, n3] $
-          output "HeadIsOpen" ["utxo" .= object mempty, "headId" .= headId]
+        waitForNodesConnected hydraTracer 20 $ n1 :| [n2, n3]
 
-    bobChainConfig' <- chainConfigFor Bob workDir nodeSocket hydraScriptsTxId [Carol] contestationPeriod depositDeadline
-    carolChainConfig' <- chainConfigFor Carol workDir nodeSocket hydraScriptsTxId [Bob] contestationPeriod depositDeadline
+    bobChainConfig' <-
+      chainConfigFor Bob workDir nodeSocket hydraScriptsTxId [Carol] contestationPeriod depositDeadline
+        <&> setNetworkId networkId
+    carolChainConfig' <-
+      chainConfigFor Carol workDir nodeSocket hydraScriptsTxId [Bob] contestationPeriod depositDeadline
+        <&> setNetworkId networkId
 
     withHydraNode hydraTracer bobChainConfig' workDir 2 bobSk [carolVk] [2, 3] $ \n2 -> do
       withHydraNode hydraTracer carolChainConfig' workDir 3 carolSk [bobVk] [2, 3] $ \n3 -> do
-        send n1 $ input "Init" []
-        headId <- waitMatch 20 n2 $ headIsInitializingWith (Set.fromList [bob, carol])
-
-        requestCommitTx n2 mempty >>= submitTx node
-        requestCommitTx n3 mempty >>= submitTx node
+        waitForNodesConnected hydraTracer 20 $ n2 :| [n3]
 
-        waitFor hydraTracer (20 * blockTime) [n2, n3] $
-          output "HeadIsOpen" ["utxo" .= object mempty, "headId" .= headId]
-
-    withHydraNode hydraTracer bobChainConfig workDir 2 bobSk [aliceVk, carolVk] [1, 2, 3] $ \_ -> do
-      withHydraNode hydraTracer carolChainConfig workDir 3 carolSk [aliceVk, bobVk] [1, 2, 3] $ \_ -> do
-        send n1 $ input "Close" []
-
-        waitMatch (10 * blockTime) n1 $ \v -> do
-          guard $ v ^? key "tag" == Just "HeadIsClosed"
-          v ^? key "contestationDeadline" . _JSON
+    withHydraNode hydraTracer bobChainConfig workDir 2 bobSk [aliceVk, carolVk] [1, 2, 3] $ \n2 -> do
+      withHydraNode hydraTracer carolChainConfig workDir 3 carolSk [aliceVk, bobVk] [1, 2, 3] $ \n3 -> do
+        waitForNodesConnected hydraTracer 20 $ n1 :| [n2, n3]
 
 -- | Two hydra node setup where Alice is wrongly configured to use Carol's
 -- cardano keys instead of Bob's which will prevent him to be notified the