handshake: more convenient type of unversionedProtocolDataCodec

IntersectMBO · Oct 14, 2021 · 784e14f · 784e14f
1 parent 8565b98
commit 784e14f
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/ouroboros-network-framework/demo/connection-manager.hs b/ouroboros-network-framework/demo/connection-manager.hs
@@ -66,8 +66,7 @@ import           Ouroboros.Network.IOManager
 import           Ouroboros.Network.Mux
 import           Ouroboros.Network.MuxMode
 import           Ouroboros.Network.Protocol.Handshake
-import           Ouroboros.Network.Protocol.Handshake.Codec ( cborTermVersionDataCodec
-                                                            , timeLimitsHandshake )
+import           Ouroboros.Network.Protocol.Handshake.Codec (timeLimitsHandshake)
 import           Ouroboros.Network.Protocol.Handshake.Unversioned
 import           Ouroboros.Network.Protocol.Handshake.Version (Acceptable (..))
 import           Ouroboros.Network.Server.RateLimiting (AcceptedConnectionsLimit (..))
@@ -244,7 +243,7 @@ withBidirectionalConnectionManager snocket socket
               -- TraceSendRecv
               haHandshakeTracer = ("handshake",) `contramap` debugTracer,
               haHandshakeCodec = unversionedHandshakeCodec,
-              haVersionDataCodec = cborTermVersionDataCodec unversionedProtocolDataCodec,
+              haVersionDataCodec = unversionedProtocolDataCodec,
               haAcceptVersion = acceptableVersion,
               haTimeLimits = timeLimitsHandshake
             }

diff --git a/ouroboros-network-framework/demo/ping-pong.hs b/ouroboros-network-framework/demo/ping-pong.hs
@@ -111,7 +111,7 @@ clientPingPong pipelined =
       (Snocket.localSnocket iomgr)
       unversionedHandshakeCodec
       noTimeLimitsHandshake
-      (cborTermVersionDataCodec unversionedProtocolDataCodec)
+      unversionedProtocolDataCodec
       nullNetworkConnectTracers
       acceptableVersion
       (unversionedProtocol app)
@@ -153,7 +153,7 @@ serverPingPong =
       defaultLocalSocketAddr
       unversionedHandshakeCodec
       noTimeLimitsHandshake
-      (cborTermVersionDataCodec unversionedProtocolDataCodec)
+      unversionedProtocolDataCodec
       acceptableVersion
       (unversionedProtocol (SomeResponderApplication app))
       nullErrorPolicies
@@ -209,7 +209,7 @@ clientPingPong2 =
       (Snocket.localSnocket iomgr)
       unversionedHandshakeCodec
       noTimeLimitsHandshake
-      (cborTermVersionDataCodec unversionedProtocolDataCodec)
+      unversionedProtocolDataCodec
       nullNetworkConnectTracers
       acceptableVersion
       (unversionedProtocol app)
@@ -264,7 +264,7 @@ serverPingPong2 =
       defaultLocalSocketAddr
       unversionedHandshakeCodec
       noTimeLimitsHandshake
-      (cborTermVersionDataCodec unversionedProtocolDataCodec)
+      unversionedProtocolDataCodec
       acceptableVersion
       (unversionedProtocol (SomeResponderApplication app))
       nullErrorPolicies

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs b/ouroboros-network-framework/src/Ouroboros/Network/Protocol/Handshake/Unversioned.hs
@@ -43,8 +43,10 @@ instance Acceptable UnversionedProtocolData where
                     UnversionedProtocolData = Accept UnversionedProtocolData
 
 
-unversionedProtocolDataCodec :: UnversionedProtocol -> CodecCBORTerm Text UnversionedProtocolData
-unversionedProtocolDataCodec _ = CodecCBORTerm {encodeTerm, decodeTerm}
+unversionedProtocolDataCodec :: VersionDataCodec CBOR.Term UnversionedProtocol
+                                                           UnversionedProtocolData
+unversionedProtocolDataCodec = cborTermVersionDataCodec
+                                 (const CodecCBORTerm {encodeTerm, decodeTerm})
     where
       encodeTerm :: UnversionedProtocolData -> CBOR.Term
       encodeTerm UnversionedProtocolData = CBOR.TNull

diff --git a/ouroboros-network-framework/test/Test/Ouroboros/Network/Server2.hs b/ouroboros-network-framework/test/Test/Ouroboros/Network/Server2.hs
@@ -77,8 +77,7 @@ import qualified Ouroboros.Network.InboundGovernor.ControlChannel as Server
 import           Ouroboros.Network.Mux
 import           Ouroboros.Network.MuxMode
 import           Ouroboros.Network.Protocol.Handshake
-import           Ouroboros.Network.Protocol.Handshake.Codec ( cborTermVersionDataCodec
-                                                            , noTimeLimitsHandshake)
+import           Ouroboros.Network.Protocol.Handshake.Codec (noTimeLimitsHandshake)
 import           Ouroboros.Network.Protocol.Handshake.Unversioned
 import           Ouroboros.Network.Protocol.Handshake.Version (Acceptable (..))
 import           Ouroboros.Network.RethrowPolicy
@@ -337,7 +336,7 @@ withInitiatorOnlyConnectionManager name timeouts trTracer snocket localAddr next
             -- TraceSendRecv
             haHandshakeTracer = (name,) `contramap` nullTracer,
             haHandshakeCodec = unversionedHandshakeCodec,
-            haVersionDataCodec = cborTermVersionDataCodec unversionedProtocolDataCodec,
+            haVersionDataCodec = unversionedProtocolDataCodec,
             haAcceptVersion = acceptableVersion,
             haTimeLimits = noTimeLimitsHandshake
           }
@@ -512,7 +511,7 @@ withBidirectionalConnectionManager name timeouts trTracer snocket socket localAd
               -- TraceSendRecv
               haHandshakeTracer = WithName name `contramap` nullTracer,
               haHandshakeCodec = unversionedHandshakeCodec,
-              haVersionDataCodec = cborTermVersionDataCodec unversionedProtocolDataCodec,
+              haVersionDataCodec = unversionedProtocolDataCodec,
               haAcceptVersion = acceptableVersion,
               haTimeLimits = noTimeLimitsHandshake
             }

diff --git a/ouroboros-network-framework/test/Test/Ouroboros/Network/Socket.hs b/ouroboros-network-framework/test/Test/Ouroboros/Network/Socket.hs
@@ -248,7 +248,7 @@ prop_socket_send_recv initiatorAddr responderAddr f xs =
         responderAddr
         unversionedHandshakeCodec
         noTimeLimitsHandshake
-        (cborTermVersionDataCodec unversionedProtocolDataCodec)
+        unversionedProtocolDataCodec
         acceptableVersion
         (unversionedProtocol (SomeResponderApplication responderApp))
         nullErrorPolicies
@@ -257,7 +257,7 @@ prop_socket_send_recv initiatorAddr responderAddr f xs =
             snocket
             unversionedHandshakeCodec
             noTimeLimitsHandshake
-            (cborTermVersionDataCodec unversionedProtocolDataCodec)
+            unversionedProtocolDataCodec
             (NetworkConnectTracers activeMuxTracer nullTracer)
             acceptableVersion
             (unversionedProtocol initiatorApp)
@@ -500,7 +500,7 @@ prop_socket_client_connect_error _ xs =
         (socketSnocket iomgr)
         unversionedHandshakeCodec
         noTimeLimitsHandshake
-        (cborTermVersionDataCodec unversionedProtocolDataCodec)
+        unversionedProtocolDataCodec
         nullNetworkConnectTracers
         acceptableVersion
         (unversionedProtocol app)

diff --git a/ouroboros-network-framework/test/Test/Ouroboros/Network/Subscription.hs b/ouroboros-network-framework/test/Test/Ouroboros/Network/Subscription.hs
@@ -588,7 +588,7 @@ prop_send_recv f xs _first = ioProperty $ withIOManager $ \iocp -> do
         (Socket.addrAddress responderAddr)
         unversionedHandshakeCodec
         noTimeLimitsHandshake
-        (cborTermVersionDataCodec unversionedProtocolDataCodec)
+        unversionedProtocolDataCodec
         acceptableVersion
         (unversionedProtocol (SomeResponderApplication responderApp))
         nullErrorPolicies
@@ -613,7 +613,7 @@ prop_send_recv f xs _first = ioProperty $ withIOManager $ \iocp -> do
                 iocp
                 unversionedHandshakeCodec
                 noTimeLimitsHandshake
-                (cborTermVersionDataCodec unversionedProtocolDataCodec)
+                unversionedProtocolDataCodec
                 nullNetworkConnectTracers
                 acceptableVersion
                 (unversionedProtocol initiatorApp))
@@ -734,7 +734,7 @@ prop_send_recv_init_and_rsp f xs = ioProperty $ withIOManager $ \iocp -> do
         responderAddr
         unversionedHandshakeCodec
         noTimeLimitsHandshake
-        (cborTermVersionDataCodec unversionedProtocolDataCodec)
+        unversionedProtocolDataCodec
         acceptableVersion
         (unversionedProtocol (SomeResponderApplication (appX rrcfg)))
         nullErrorPolicies
@@ -755,7 +755,7 @@ prop_send_recv_init_and_rsp f xs = ioProperty $ withIOManager $ \iocp -> do
           responderAddr
           unversionedHandshakeCodec
           noTimeLimitsHandshake
-          (cborTermVersionDataCodec unversionedProtocolDataCodec)
+          unversionedProtocolDataCodec
           acceptableVersion
           (unversionedProtocol (SomeResponderApplication (appX rrcfg)))
           nullErrorPolicies
@@ -781,7 +781,7 @@ prop_send_recv_init_and_rsp f xs = ioProperty $ withIOManager $ \iocp -> do
                   iocp
                   unversionedHandshakeCodec
                   noTimeLimitsHandshake
-                  (cborTermVersionDataCodec unversionedProtocolDataCodec)
+                  unversionedProtocolDataCodec
                   nullNetworkConnectTracers
                   acceptableVersion
                   (unversionedProtocol (appX rrcfg)))
@@ -854,7 +854,7 @@ _demo = ioProperty $ withIOManager $ \iocp -> do
                 iocp
                 unversionedHandshakeCodec
                 noTimeLimitsHandshake
-                (cborTermVersionDataCodec unversionedProtocolDataCodec)
+                unversionedProtocolDataCodec
                 nullNetworkConnectTracers
                 acceptableVersion
                 (unversionedProtocol appReq))
@@ -877,7 +877,7 @@ _demo = ioProperty $ withIOManager $ \iocp -> do
             (Socket.addrAddress addr)
             unversionedHandshakeCodec
             noTimeLimitsHandshake
-            (cborTermVersionDataCodec unversionedProtocolDataCodec)
+            unversionedProtocolDataCodec
             acceptableVersion
             (unversionedProtocol (SomeResponderApplication appRsp))
             nullErrorPolicies

diff --git a/ouroboros-network/demo/chain-sync.hs b/ouroboros-network/demo/chain-sync.hs
@@ -156,7 +156,7 @@ clientChainSync sockPaths = withIOManager $ \iocp ->
         (localSnocket iocp)
         unversionedHandshakeCodec
         noTimeLimitsHandshake
-        (cborTermVersionDataCodec unversionedProtocolDataCodec)
+        unversionedProtocolDataCodec
         nullNetworkConnectTracers
         acceptableVersion
         (simpleSingletonVersions
@@ -190,7 +190,7 @@ serverChainSync sockAddr = withIOManager $ \iocp -> do
       (localAddressFromPath sockAddr)
       unversionedHandshakeCodec
       noTimeLimitsHandshake
-      (cborTermVersionDataCodec unversionedProtocolDataCodec)
+      unversionedProtocolDataCodec
       acceptableVersion
       (simpleSingletonVersions
         UnversionedProtocol
@@ -370,7 +370,7 @@ clientBlockFetch sockAddrs = withIOManager $ \iocp -> do
                           (localSnocket iocp)
                           unversionedHandshakeCodec
                           noTimeLimitsHandshake
-                          (cborTermVersionDataCodec unversionedProtocolDataCodec)
+                          unversionedProtocolDataCodec
                           nullNetworkConnectTracers
                           acceptableVersion
                           (simpleSingletonVersions
@@ -426,7 +426,7 @@ serverBlockFetch sockAddr = withIOManager $ \iocp -> do
       (localAddressFromPath sockAddr)
       unversionedHandshakeCodec
       noTimeLimitsHandshake
-      (cborTermVersionDataCodec unversionedProtocolDataCodec)
+      unversionedProtocolDataCodec
       acceptableVersion
       (simpleSingletonVersions
         UnversionedProtocol