Initialize HeadParameters from InitTx

hydra-node/exe/hydra-node/Main.hs

@@ -35,7 +35,7 @@ main = do
     withMonitoring monitoringPort tracer' $ \tracer -> do
       let env = Environment nodeId
       eq <- createEventQueue
-      let headState = createHeadState [] (HeadParameters 3 []) SnapshotStrategy
+      let headState = createHeadState [] (HeadParameters 3 mempty) SnapshotStrategy
       hh <- createHydraHead headState Ledger.mockLedger
       oc <- createMockChainClient eq (contramap MockChain tracer)
       withOuroborosHydraNetwork (show host, port) peers (putEvent eq . NetworkEvent) $ \hn -> do

hydra-node/src/Hydra/HeadLogic.hs

@@ -75,7 +75,7 @@ data HydraMessage tx
   deriving (Eq, Show)
 
 data OnChainTx
-  = InitTx (Set.Set ParticipationToken)
+  = InitTx (Set ParticipationToken)
   | CommitTx ParticipationToken Natural
   | CollectComTx
   | CloseTx
@@ -115,7 +115,7 @@ type PendingCommits = Set ParticipationToken
 -- | Contains at least the contestation period and other things.
 data HeadParameters = HeadParameters
   { contestationPeriod :: DiffTime
-  , parties :: [Party]
+  , parties :: Set Party
   }
   deriving (Eq, Show)
 
@@ -166,9 +166,10 @@ update ::
   Outcome tx
 update Environment{party} ledger (HeadState p st) ev = case (st, ev) of
   (InitState, ClientEvent (Init parties)) ->
-    newState (p{parties}) InitState [OnChainEffect (InitTx $ makeAllTokens parties)]
+    newState p InitState [OnChainEffect (InitTx $ makeAllTokens parties)]
   (InitState, OnChainEvent (InitTx tokens)) ->
-    newState p (CollectingState tokens mempty) [ClientEffect ReadyToCommit]
+    let parties = Set.map thisToken tokens
+     in newState (p{parties}) (CollectingState tokens mempty) [ClientEffect ReadyToCommit]
   --
   (CollectingState remainingTokens _, ClientEvent (Commit amount)) ->
     case findToken remainingTokens party of
@@ -210,7 +211,7 @@ update Environment{party} ledger (HeadState p st) ev = case (st, ev) of
               Set.insert
                 otherParty
                 (fromMaybe Set.empty $ Map.lookup tx (signatures headState))
-        if sigs == Set.fromList (parties p)
+        if sigs == parties p
           then
             newState
               p

hydra-node/test/Hydra/BehaviorSpec.hs

@@ -241,7 +241,7 @@ startHydraNode nodeId connectToChain = do
   createHydraNode response = do
     let env = Environment nodeId
     eq <- createEventQueue
-    let headState = createHeadState [] (HeadParameters 3 []) SnapshotStrategy
+    let headState = createHeadState [] (HeadParameters 3 mempty) SnapshotStrategy
     hh <- createHydraHead headState mockLedger
     let hn' = HydraNetwork{broadcast = const $ pure ()}
     let node = HydraNode{eq, hn = hn', hh, oc = OnChain (const $ pure ()), sendResponse = putMVar response, env}

hydra-node/test/Hydra/HeadLogicSpec.hs

@@ -7,6 +7,7 @@ import Cardano.Prelude
 import Control.Monad.Fail (
   fail,
  )
+import qualified Data.Set as Set
 import Hydra.HeadLogic (
   Environment (..),
   Event (NetworkEvent),
@@ -31,7 +32,7 @@ import Test.Hspec (
 spec :: Spec
 spec = describe "Hydra Head Logic" $ do
   it "confirms tx given it receives AckTx from all parties" $ do
-    let allParties = [1, 2, 3]
+    let allParties = Set.fromList [1, 2, 3]
         reqTx = NetworkEvent $ MessageReceived $ ReqTx (ValidTx 1)
         ackFrom1 = NetworkEvent $ MessageReceived $ AckTx 1 (ValidTx 1)
         ackFrom2 = NetworkEvent $ MessageReceived $ AckTx 2 (ValidTx 1)