Remove ConfTx and ConfSn as we are locally confirming

input-output-hk · Jun 16, 2021 · c402b2d · c402b2d
1 parent abe3316
commit c402b2d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/hydra-node/src/Hydra/HeadLogic.hs b/hydra-node/src/Hydra/HeadLogic.hs
@@ -81,10 +81,8 @@ deriving instance Tx tx => Show (ClientResponse tx)
 data HydraMessage tx
   = ReqTx tx
   | AckTx Party tx
-  | ConfTx
   | ReqSn SnapshotNumber [tx]
   | AckSn Party SnapshotNumber
-  | ConfSn
   | Ping Party
   deriving (Eq, Show)
 

diff --git a/hydra-node/src/Hydra/Network.hs b/hydra-node/src/Hydra/Network.hs
@@ -76,10 +76,8 @@ instance (ToCBOR tx, ToCBOR (UTxO tx)) => ToCBOR (HydraMessage tx) where
   toCBOR = \case
     ReqTx tx -> toCBOR ("ReqTx" :: Text) <> toCBOR tx
     AckTx party tx -> toCBOR ("AckTx" :: Text) <> toCBOR party <> toCBOR tx
-    ConfTx -> toCBOR ("ConfTx" :: Text)
     ReqSn sn txs -> toCBOR ("ReqSn" :: Text) <> toCBOR sn <> toCBOR txs
     AckSn party sn -> toCBOR ("AckSn" :: Text) <> toCBOR party <> toCBOR sn
-    ConfSn -> toCBOR ("ConfSn" :: Text)
     Ping party -> toCBOR ("Ping" :: Text) <> toCBOR party
 
 instance (ToCBOR tx, ToCBOR (UTxO tx)) => ToCBOR (Snapshot tx) where
@@ -90,10 +88,8 @@ instance (FromCBOR tx, FromCBOR (UTxO tx)) => FromCBOR (HydraMessage tx) where
     fromCBOR >>= \case
       ("ReqTx" :: Text) -> ReqTx <$> fromCBOR
       "AckTx" -> AckTx <$> fromCBOR <*> fromCBOR
-      "ConfTx" -> pure ConfTx
       "ReqSn" -> ReqSn <$> fromCBOR <*> fromCBOR
       "AckSn" -> AckSn <$> fromCBOR <*> fromCBOR
-      "ConfSn" -> pure ConfSn
       "Ping" -> Ping <$> fromCBOR
       msg -> fail $ show msg <> " is not a proper CBOR-encoded HydraMessage"
 

diff --git a/hydra-node/test/Hydra/Network/HeartbeatSpec.hs b/hydra-node/test/Hydra/Network/HeartbeatSpec.hs
@@ -40,17 +40,18 @@ spec = describe "Heartbeat" $ do
     receivedHeartbeats `shouldBe` [Ping 2]
 
   it "stop sending heartbeat message given action sends a message" $ do
-    let sentHeartbeats = runSimOrThrow $ do
+    let someMessage = AckSn 1 1
+        sentHeartbeats = runSimOrThrow $ do
           sentMessages <- newTVarIO ([] :: [HydraMessage MockTx])
 
           withHeartbeat 1 (dummyNetwork sentMessages) noop $ \Network{broadcast} -> do
             threadDelay 0.6
-            broadcast ConfSn
+            broadcast someMessage
             threadDelay 1
 
           atomically $ readTVar sentMessages
 
-    sentHeartbeats `shouldBe` [ConfSn, Ping 1]
+    sentHeartbeats `shouldBe` [someMessage, Ping 1]
 
 noop :: Monad m => b -> m ()
 noop = const $ pure ()
diff --git a/hydra-node/test/Hydra/NetworkSpec.hs b/hydra-node/test/Hydra/NetworkSpec.hs
@@ -89,10 +89,8 @@ instance Arbitrary (HydraMessage MockTx) where
     oneof
       [ ReqTx <$> arbitrary
       , AckTx <$> arbitraryNatural <*> arbitrary
-      , pure ConfTx
       , ReqSn <$> arbitraryNatural <*> arbitrary
       , AckSn <$> arbitraryNatural <*> arbitraryNatural
-      , pure ConfSn
       , Ping <$> arbitraryNatural
       ]