define withSocketType, use network 3.0.0.0

network-mux/src/Network/Mux/Bearer/Socket.hs

@@ -20,7 +20,7 @@ import           Control.Monad.Class.MonadThrow
 import           Control.Monad.Class.MonadTime
 import           Control.Monad.Class.MonadTimer
 
-import qualified Network.Socket as Socket hiding (recv)
+import qualified Network.Socket as Socket
 import qualified Network.Socket.ByteString.Lazy as Socket (recv, sendAll)
 
 import qualified Network.Mux as Mx

network-mux/src/Network/Mux/Channel.hs

@@ -24,7 +24,7 @@ import           Data.Time.Clock (DiffTime)
 import qualified System.Process as IO (createPipe)
 import qualified System.IO      as IO
                    ( Handle, withFile, IOMode(..), hFlush, hIsEOF )
-import qualified Network.Socket            as Socket hiding (send, recv)
+import qualified Network.Socket            as Socket
 import qualified Network.Socket.ByteString as Socket
 
 import           Control.Monad.Class.MonadSTM

ouroboros-network/src/Ouroboros/Network/Connections/Socket/Types.hs

@@ -1,13 +1,17 @@
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE KindSignatures #-}
 
 module Ouroboros.Network.Connections.Socket.Types
   ( SockType (..)
   , SockAddr (..)
+  , Some (..)
+  , withSockType
   , forgetSockType
   ) where
 
+import Data.Kind (Type)
 import qualified Network.Socket as Socket
 
 data SockType where
@@ -26,6 +30,15 @@ data SockAddr (sockType :: SockType) where
                 -> SockAddr Inet6
   SockAddrUnix  :: String -> SockAddr Unix
 
+data Some (ty :: l -> Type) where
+  Some :: ty x -> Some ty
+
+withSockType :: Socket.SockAddr -> Some SockAddr
+withSockType sockAddr = case sockAddr of
+  Socket.SockAddrInet  pn ha       -> Some (SockAddrInet  pn ha)
+  Socket.SockAddrInet6 pn fi ha si -> Some (SockAddrInet6 pn fi ha si)
+  Socket.SockAddrUnix  st          -> Some (SockAddrUnix  st)
+
 forgetSockType :: SockAddr sockType -> Socket.SockAddr
 forgetSockType sockAddr = case sockAddr of
   SockAddrInet  pn ha       -> Socket.SockAddrInet  pn ha

ouroboros-network/src/Ouroboros/Network/Socket.hs

@@ -66,7 +66,7 @@ import qualified Data.ByteString.Lazy as BL
 import           Data.Int
 import           Data.Void
 
-import qualified Network.Socket as Socket hiding (recv)
+import qualified Network.Socket as Socket
 
 import           Cardano.Prelude (NoUnexpectedThunks (..), ThunkInfo (..))
 
@@ -466,8 +466,7 @@ runServerThread NetworkServerTracers { nstMuxTracer
         (beginConnection nstMuxTracer nstHandshakeTracer versionDataCodec acceptVersion (acceptConnectionTx sockAddr))
         -- register producer when application starts, it will be unregistered
         -- using 'CompleteConnection'
-        (\remoteAddr thread st -> pure $ registerProducer remoteAddr thread
-        st)
+        (\remoteAddr thread st -> pure $ registerProducer remoteAddr thread st)
         completeTx mainTx (toLazyTVar nmsPeerStates)
   where
     mainTx :: Server.Main (PeerStates IO Socket.SockAddr) Void

ouroboros-network/src/Ouroboros/Network/Subscription/Worker.hs

@@ -155,7 +155,6 @@ sockAddrFamily
 sockAddrFamily (Socket.SockAddrInet  _ _    ) = Socket.AF_INET
 sockAddrFamily (Socket.SockAddrInet6 _ _ _ _) = Socket.AF_INET6
 sockAddrFamily (Socket.SockAddrUnix _       ) = Socket.AF_UNIX
-sockAddrFamily _                              = Socket.AF_UNSPEC
 
 -- | 'Socket' term instanciated with 'Network.Socket'.
 --

stack.yaml

@@ -79,5 +79,7 @@ extra-deps:
   # Windows only
   - Win32-2.6.2.0
 
+  - network-3.0.0.0
+
 nix:
   shell-file: nix/stack-shell.nix