From 776d1bddbb45461f11b1ee88a278ab2b514b9c5d Mon Sep 17 00:00:00 2001
From: John Ky <john.ky@iohk.io>
Date: Fri, 27 Nov 2020 21:04:42 +1100
Subject: [PATCH] Stuff

---
 .../src/Ouroboros/Network/Diffusion.hs        | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/ouroboros-network/src/Ouroboros/Network/Diffusion.hs b/ouroboros-network/src/Ouroboros/Network/Diffusion.hs
index e835637875b..f5c259401de 100644
--- 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