Stuff

IntersectMBO · Nov 27, 2020 · 776d1bd · 776d1bd
1 parent 0fbca7a
commit 776d1bd
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion.hs
@@ -33,12 +33,10 @@ import Network.Mux (MuxTrace (..), WithMuxBearer (..))
 import Network.Socket (AddrInfo, SockAddr)
 import qualified Network.Socket as Socket
 
-import Ouroboros.Network.Snocket ( FileDescriptor
- , LocalAddress
+import Ouroboros.Network.Snocket ( LocalAddress
  , LocalSnocket
  , LocalSocket (..)
  , SocketSnocket
- , localSocketFileDescriptor
  )
 import qualified Ouroboros.Network.Snocket as Snocket
 
@@ -75,9 +73,9 @@ data DiffusionInitializationTracer
  | UsingSystemdSocket !FilePath
  | CreateSystemdSocketForSnocketPath !FilePath
  | CreatedLocalSocket !FilePath
- | ConfiguringLocalSocket !FilePath !FileDescriptor
- | ListeningLocalSocket !FilePath !FileDescriptor
- | LocalSocketUp !FilePath !FileDescriptor
+ | ConfiguringLocalSocket !FilePath
+ | ListeningLocalSocket !FilePath
+ | LocalSocketUp !FilePath
  | CreatingServerSocket !SockAddr
  | ConfiguringServerSocket !SockAddr
  | ListeningServerSocket !SockAddr
@@ -365,18 +363,15 @@ runDataDiffusion tracers
  -- If a socket was provided it should be ready to accept
  Left _ -> pure ()
  Right path -> do
- traceWith dtDiffusionInitializationTracer . ConfiguringLocalSocket path
- =<< localSocketFileDescriptor sd
+ traceWith dtDiffusionInitializationTracer $ ConfiguringLocalSocket path
 
  Snocket.bind sn sd $ Snocket.localAddressFromPath path
 
- traceWith dtDiffusionInitializationTracer . ListeningLocalSocket path
- =<< localSocketFileDescriptor sd
+ traceWith dtDiffusionInitializationTracer $ ListeningLocalSocket path
 
  Snocket.listen sn sd
 
- traceWith dtDiffusionInitializationTracer . LocalSocketUp path
- =<< localSocketFileDescriptor sd
+ traceWith dtDiffusionInitializationTracer $ LocalSocketUp path
 
  traceWith dtDiffusionInitializationTracer . RunLocalServer =<< Snocket.getLocalAddr sn sd