Drop network-mux dep on cborg and typed-protocols.

The cborg dep is not used at all. To drop the dep on typed-protocols we just had to make sure network-mux always uses the Channel type from network-mux rather than the one from typed-protocols. The network-mux tests still use cborg and typed-protocols but that's ok.
IntersectMBO · Jan 16, 2020 · c527b00 · c527b00
1 parent 90c1ba8
commit c527b00
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/network-mux/network-mux.cabal b/network-mux/network-mux.cabal
@@ -26,14 +26,12 @@ Flag ipv6
 
 library
   build-depends:       base            >=4.9 && <4.13,
-                       typed-protocols >=0.1 && <0.2,
                        io-sim-classes  >=0.1 && <0.2,
                        contra-tracer   >=0.1 && <0.2,
 
                        array           >=0.5 && <0.6,
                        binary          >=0.8 && <0.9,
                        bytestring      >=0.10 && <0.11,
-                       cborg           >=0.2.1 && <0.3,
                        containers,
                        network,
                        process         >=1.6 && <1.7,

diff --git a/network-mux/src/Network/Mux/Types.hs b/network-mux/src/Network/Mux/Types.hs
@@ -34,8 +34,8 @@ import qualified Data.ByteString.Lazy as BL
 
 import           Control.Monad.Class.MonadTime
 
-import           Network.Mux.Channel (Channel)
-import qualified Network.TypedProtocol.Channel as TypedProtocol
+import           Network.Mux.Channel (Channel(..))
+
 
 newtype RemoteClockModel
   = RemoteClockModel { unRemoteClockModel :: Word32 }
@@ -186,16 +186,13 @@ data MuxBearer m = MuxBearer {
 muxBearerAsControlChannel
   :: MuxBearer IO
   -> MiniProtocolMode
-  -> TypedProtocol.Channel IO BL.ByteString
+  -> Channel IO
 muxBearerAsControlChannel bearer mode =
-      TypedProtocol.Channel {
-        TypedProtocol.send = send,
-        TypedProtocol.recv = recv
+      Channel {
+        send = \blob -> void $ write bearer (wrap blob),
+        recv = Just . msBlob . fst <$> read bearer
       }
     where
-      send blob = void $ write bearer (wrap blob)
-      recv = Just . msBlob . fst <$> read bearer
-
       -- wrap a 'ByteString' as 'MuxSDU'
       wrap :: BL.ByteString -> MuxSDU
       wrap blob = MuxSDU {

diff --git a/nix/.stack.nix/network-mux.nix b/nix/.stack.nix/network-mux.nix
diff --git a/ouroboros-network/src/Ouroboros/Network/Socket.hs b/ouroboros-network/src/Ouroboros/Network/Socket.hs
@@ -86,6 +86,7 @@ import           Ouroboros.Network.Protocol.Handshake.Type
 import           Ouroboros.Network.Protocol.Handshake.Version
 import           Ouroboros.Network.Protocol.Handshake.Codec
 import           Ouroboros.Network.Mux
+import           Ouroboros.Network.Channel
 import qualified Ouroboros.Network.Server.Socket as Server
 import           Ouroboros.Network.Server.ConnectionTable
 
@@ -232,7 +233,7 @@ connectToNode' versionDataCodec NetworkConnectTracers {nctMuxTracer, nctHandshak
               nctHandshakeTracer
               codecHandshake
               connectionId
-              (Mx.muxBearerAsControlChannel bearer Mx.ModeInitiator)
+              (fromChannel (Mx.muxBearerAsControlChannel bearer Mx.ModeInitiator))
               (handshakeClientPeer versionDataCodec versions)
     ts_end <- getMonotonicTime
     case mapp of
@@ -310,7 +311,7 @@ beginConnection muxTracer handshakeTracer versionDataCodec acceptVersion fn t ad
                 handshakeTracer
                 codecHandshake
                 peerid
-                (Mx.muxBearerAsControlChannel bearer Mx.ModeResponder)
+                (fromChannel (Mx.muxBearerAsControlChannel bearer Mx.ModeResponder))
                 (handshakeServerPeer versionDataCodec acceptVersion versions)
         case mapp of
           Left err -> do