Use a directory name that is the hash of the clusterPeers for etcd state

Author: locallycompact

hydra-node/hydra-node.cabal

@@ -149,6 +149,7 @@ library
     , resourcet
     , safe-money
     , serialise
+    , SHA
     , sop-extras
     , stm
     , text

hydra-node/src/Hydra/Network/Etcd.hs

@@ -59,6 +59,8 @@ import Data.Aeson (decodeFileStrict', encodeFile)
 import Data.Aeson qualified as Aeson
 import Data.Aeson.Types (Value)
 import Data.ByteString qualified as BS
+import Data.ByteString.Lazy.Char8 qualified as LBS8
+import Data.Digest.Pure.SHA (sha256, showDigest)
 import Data.List ((\\))
 import Data.List qualified as List
 import Data.Map qualified as Map
@@ -199,7 +201,7 @@ withEtcdNetwork tracer protocolVersion config callback action = do
       $ concat
         [ -- NOTE: Must be used in clusterPeers
           ["--name", show advertise]
-        , ["--data-dir", persistenceDir </> "etcd"]
+        , ["--data-dir", persistenceDir </> "etcd" </> showDigest (sha256 $ LBS8.pack clusterPeers)]
         , ["--listen-peer-urls", httpUrl listen]
         , ["--initial-advertise-peer-urls", httpUrl advertise]
         , ["--listen-client-urls", httpUrl clientHost]

hydra-node/test/Hydra/NetworkSpec.hs

@@ -111,7 +111,7 @@ spec = do
 
       it "emits connectivity events" $ \tracer -> do
         withTempDir "test-etcd" $ \tmp -> do
-          failAfter 20 $ do
+          failAfter 30 $ do
             PeerConfig3{aliceConfig, bobConfig, carolConfig} <- setup3Peers tmp
             -- Record and assert connectivity events from alice's perspective
             (recordReceived, _, waitConnectivity) <- newRecordingCallback