From f7d522f47cc1d861556e49774588dbd51bbe7356 Mon Sep 17 00:00:00 2001
From: Marcin Szamotulski <profunctor@pm.me>
Date: Mon, 23 Nov 2020 17:12:58 +0100
Subject: [PATCH] snocket: Accept swap type parameters

This makes 'Accept' consistent with 'Snocket.
---
 .../src/Ouroboros/Network/Snocket.hs               | 14 +++++++-------
 .../src/Ouroboros/Network/Socket.hs                |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Snocket.hs b/ouroboros-network-framework/src/Ouroboros/Network/Snocket.hs
index 714c12eb8b4..e584e92e63d 100644
--- a/ouroboros-network-framework/src/Ouroboros/Network/Snocket.hs
+++ b/ouroboros-network-framework/src/Ouroboros/Network/Snocket.hs
@@ -91,21 +91,21 @@ import           Ouroboros.Network.IOManager
 -- created by 'open' and only subsequent calls will create a new file
 -- descriptor by `createNamedPipe`, see 'namedPipeSnocket'.
 --
-newtype Accept m addr fd = Accept
-  { runAccept :: m (fd, addr, Accept m addr fd)
+newtype Accept m fd addr = Accept
+  { runAccept :: m (fd, addr, Accept m fd addr)
   }
 
 instance Functor m => Bifunctor (Accept m) where
     bimap f g ac = Accept $ h <$> runAccept ac
       where
-        h (fd, addr, next) = (g fd, f addr, bimap f g next)
+        h (fd, addr, next) = (f fd, g addr, bimap f g next)
 
 
 -- | BSD accept loop.
 --
 berkeleyAccept :: IOManager
                -> Socket
-               -> Accept IO SockAddr Socket
+               -> Accept IO Socket SockAddr
 berkeleyAccept ioManager sock = go
     where
       go = Accept $ do
@@ -181,7 +181,7 @@ data Snocket m fd addr = Snocket {
   , bind          :: fd -> addr -> m ()
   , listen        :: fd -> m ()
 
-  , accept        :: fd -> Accept m addr fd
+  , accept        :: fd -> Accept m fd addr
 
   , close         :: fd -> m ()
 
@@ -346,7 +346,7 @@ localSnocket ioManager path = Snocket {
     localAddress :: LocalAddress
     localAddress = LocalAddress path
 
-    acceptNext :: Accept IO LocalAddress LocalSocket
+    acceptNext :: Accept IO LocalSocket LocalAddress
     acceptNext = Accept $ do
       hpipe <- Win32.createNamedPipe
                  path
@@ -373,7 +373,7 @@ localSnocket ioManager _ =
           Socket.connect s (fromLocalAddress addr)
       , bind          = \(LocalSocket fd) addr -> Socket.bind fd (fromLocalAddress addr)
       , listen        = flip Socket.listen 1 . getLocalHandle
-      , accept        = bimap toLocalAddress LocalSocket
+      , accept        = bimap LocalSocket toLocalAddress
                       . berkeleyAccept ioManager
                       . getLocalHandle
       , open          = openSocket
diff --git a/ouroboros-network-framework/src/Ouroboros/Network/Socket.hs b/ouroboros-network-framework/src/Ouroboros/Network/Socket.hs
index 10f6939df68..c6735035a41 100644
--- a/ouroboros-network-framework/src/Ouroboros/Network/Socket.hs
+++ b/ouroboros-network-framework/src/Ouroboros/Network/Socket.hs
@@ -420,7 +420,7 @@ fromSnocket
     -> Server.Socket addr fd
 fromSnocket tblVar sn sd = go (Snocket.accept sn sd)
   where
-    go :: Snocket.Accept IO addr fd -> Server.Socket addr fd
+    go :: Snocket.Accept IO fd addr -> Server.Socket addr fd
     go (Snocket.Accept accept) = Server.Socket $ do
       (sd', remoteAddr, next) <- accept
       -- TOOD: we don't need to that on each accept