ouroboros-network upgrade: use the new namespace for Network.Mux types

Author: neilmayhew

trace-dispatcher/src/Cardano/Logging/Forwarding.hs

@@ -17,12 +17,13 @@ module Cardano.Logging.Forwarding
 import           Cardano.Logging.Types
 import           Cardano.Logging.Utils (runInLoop)
 import           Cardano.Logging.Version
+import qualified Network.Mux as Mux
 import           Ouroboros.Network.Driver.Limits (ProtocolTimeLimits)
 import           Ouroboros.Network.ErrorPolicy (nullErrorPolicies)
 import           Ouroboros.Network.IOManager (IOManager)
 import           Ouroboros.Network.Magic (NetworkMagic)
 import           Ouroboros.Network.Mux (MiniProtocol (..), MiniProtocolLimits (..),
-                   MiniProtocolNum (..), MuxMode (..), OuroborosApplication (..),
+                   MiniProtocolNum (..), OuroborosApplication (..),
                    RunMiniProtocol (..), miniProtocolLimits, miniProtocolNum, miniProtocolRun)
 import           Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec,
                    codecHandshake, noTimeLimitsHandshake)
@@ -218,8 +219,8 @@ doConnectToAcceptor magic snocket makeBearer configureSocket address timeLimits
     address
  where
   forwarderApp
-    :: [(RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void, Word16)]
-    -> OuroborosApplication 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
+    :: [(RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void, Word16)]
+    -> OuroborosApplication 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
   forwarderApp protocols =
     OuroborosApplication
       [ MiniProtocol
@@ -281,8 +282,8 @@ doListenToAcceptor magic snocket makeBearer configureSocket address timeLimits
               wait serverAsync -- Block until async exception.
  where
   forwarderApp
-    :: [(RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void (), Word16)]
-    -> OuroborosApplication 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
+    :: [(RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void (), Word16)]
+    -> OuroborosApplication 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
   forwarderApp protocols =
     OuroborosApplication
       [ MiniProtocol

trace-dispatcher/trace-dispatcher.cabal

@@ -59,6 +59,7 @@ library
                       , ekg-forward >= 0.5
                       , hostname
                       , network
+                      , network-mux
                       , optparse-applicative-fork
                       , ouroboros-network ^>= 0.18
                       , ouroboros-network-api

trace-forward/src/Trace/Forward/Run/DataPoint/Acceptor.hs

@@ -6,8 +6,9 @@ module Trace.Forward.Run.DataPoint.Acceptor
   , acceptDataPointsResp
   ) where
 
+import qualified Network.Mux as Mux
 import           Ouroboros.Network.Driver.Simple (runPeer)
-import           Ouroboros.Network.Mux (MiniProtocolCb (..), MuxMode (..), RunMiniProtocol (..))
+import           Ouroboros.Network.Mux (MiniProtocolCb (..), RunMiniProtocol (..))
 
 import qualified Codec.Serialise as CBOR
 import           Control.Concurrent.STM.TMVar (putTMVar)
@@ -29,15 +30,15 @@ acceptDataPointsInit
   :: AcceptorConfiguration
   -> (initiatorCtx -> IO DataPointRequestor)
   -> (initiatorCtx -> IO ())
-  -> RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
+  -> RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
 acceptDataPointsInit config mkDPRequestor peerErrorHandler =
   InitiatorProtocolOnly $ runPeerWithRequestor config mkDPRequestor peerErrorHandler
 
 acceptDataPointsResp
   :: AcceptorConfiguration
   -> (responderCtx -> IO DataPointRequestor)
   -> (responderCtx -> IO ())
-  -> RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
+  -> RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
 acceptDataPointsResp config mkDPRequestor peerErrorHandler =
   ResponderProtocolOnly $ runPeerWithRequestor config mkDPRequestor peerErrorHandler
 

trace-forward/src/Trace/Forward/Run/DataPoint/Forwarder.hs

@@ -5,8 +5,9 @@ module Trace.Forward.Run.DataPoint.Forwarder
   , forwardDataPointsResp
   ) where
 
+import qualified Network.Mux as Mux
 import           Ouroboros.Network.Driver.Simple (runPeer)
-import           Ouroboros.Network.Mux (MiniProtocolCb (..), MuxMode (..), RunMiniProtocol (..))
+import           Ouroboros.Network.Mux (MiniProtocolCb (..), RunMiniProtocol (..))
 
 import qualified Codec.Serialise as CBOR
 import qualified Data.ByteString.Lazy as LBS
@@ -20,14 +21,14 @@ import           Trace.Forward.Utils.DataPoint
 forwardDataPointsInit
   :: ForwarderConfiguration
   -> DataPointStore
-  -> RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
+  -> RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
 forwardDataPointsInit config dpStore =
   InitiatorProtocolOnly $ runPeerWithDPStore config dpStore
 
 forwardDataPointsResp
   :: ForwarderConfiguration
   -> DataPointStore
-  -> RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
+  -> RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
 forwardDataPointsResp config dpStore =
   ResponderProtocolOnly $ runPeerWithDPStore config dpStore
 

trace-forward/src/Trace/Forward/Run/TraceObject/Acceptor.hs

@@ -8,8 +8,9 @@ module Trace.Forward.Run.TraceObject.Acceptor
   , acceptTraceObjectsResp
   ) where
 
+import qualified Network.Mux as Mux
 import           Ouroboros.Network.Driver.Simple (runPeer)
-import           Ouroboros.Network.Mux (MiniProtocolCb (..), MuxMode (..), RunMiniProtocol (..))
+import           Ouroboros.Network.Mux (MiniProtocolCb (..), RunMiniProtocol (..))
 import           Ouroboros.Network.Util.ShowProxy (ShowProxy (..))
 
 import qualified Codec.Serialise as CBOR
@@ -35,7 +36,7 @@ acceptTraceObjectsInit
   => AcceptorConfiguration lo -- ^ Acceptor's configuration.
   -> (initiatorCtx -> [lo] -> IO ()) -- ^ The handler for accepted 'TraceObject's.
   -> (initiatorCtx -> IO ())         -- ^ The handler for exceptions from 'runPeer'.
-  -> RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
+  -> RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
 acceptTraceObjectsInit config loHandler peerErrorHandler =
   InitiatorProtocolOnly $ runPeerWithHandler config loHandler peerErrorHandler
 
@@ -46,7 +47,7 @@ acceptTraceObjectsResp
   => AcceptorConfiguration lo -- ^ Acceptor's configuration.
   -> (responderCtx -> [lo] -> IO ()) -- ^ The handler for accepted 'TraceObject's.
   -> (responderCtx -> IO ())         -- ^ The handler for exceptions from 'runPeer'.
-  -> RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
+  -> RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
 acceptTraceObjectsResp config loHandler peerErrorHandler = do
   ResponderProtocolOnly $ runPeerWithHandler config loHandler peerErrorHandler
 

trace-forward/src/Trace/Forward/Run/TraceObject/Forwarder.hs

@@ -5,8 +5,9 @@ module Trace.Forward.Run.TraceObject.Forwarder
   , forwardTraceObjectsResp
   ) where
 
+import qualified Network.Mux as Mux
 import           Ouroboros.Network.Driver.Simple (runPeer)
-import           Ouroboros.Network.Mux (MiniProtocolCb (..), MuxMode (..), RunMiniProtocol (..))
+import           Ouroboros.Network.Mux (MiniProtocolCb (..), RunMiniProtocol (..))
 import           Ouroboros.Network.Util.ShowProxy (ShowProxy (..))
 
 import qualified Codec.Serialise as CBOR
@@ -23,7 +24,7 @@ forwardTraceObjectsInit
       ShowProxy lo)
   => ForwarderConfiguration lo
   -> ForwardSink lo
-  -> RunMiniProtocol 'InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
+  -> RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void
 forwardTraceObjectsInit config sink =
   InitiatorProtocolOnly $ runPeerWithSink config sink
 
@@ -32,7 +33,7 @@ forwardTraceObjectsResp
       ShowProxy lo)
   => ForwarderConfiguration lo
   -> ForwardSink lo
-  -> RunMiniProtocol 'ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
+  -> RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void ()
 forwardTraceObjectsResp config sink =
   ResponderProtocolOnly $ runPeerWithSink config sink
 

trace-forward/trace-forward.cabal

@@ -64,6 +64,7 @@ library
                       , deepseq
                       , extra
                       , io-classes
+                      , network-mux
                       , ouroboros-network-api
                       , singletons ^>= 3.0
                       , ouroboros-network-framework ^>= 0.14