connection-manager: simplify ConnMap.traverseMaybeWithKey

Author: coot

ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/ConnMap.hs

@@ -17,7 +17,7 @@ module Ouroboros.Network.ConnectionManager.ConnMap
   , lookup
   , lookupByRemoteAddr
   , updateLocalAddr
-  , traverseMaybeWithKey
+  , traverseMaybe
   ) where
 
 import Prelude hiding (lookup)
@@ -248,22 +248,17 @@ updateLocalAddr ConnectionId { remoteAddress, localAddress } (ConnMap m) =
       m
 
 
-traverseMaybeWithKey
+traverseMaybe
   :: Applicative f
-  => (Either peerAddr (ConnectionId peerAddr) -> a -> f (Maybe b))
+  => (a -> f (Maybe b))
   -> ConnMap peerAddr a
   -> f [b]
-traverseMaybeWithKey fn =
+traverseMaybe fn =
     fmap (concat . Map.elems)
   . Map.traverseMaybeWithKey
-      (\remoteAddress st ->
+      (\_ st ->
           fmap (Just . Map.elems)
-        . Map.traverseMaybeWithKey
-            (\case
-                UnknownLocalAddr       -> fn (Left remoteAddress)
-                LocalAddr localAddress -> fn (Right ConnectionId { remoteAddress,
-                                                                   localAddress })
-            )
+        . Map.traverseMaybeWithKey (\_ -> fn)
         $ st
       )
   . getConnMap

ouroboros-network-framework/src/Ouroboros/Network/ConnectionManager/Core.hs

@@ -528,9 +528,8 @@ with args@Arguments {
         -- Spawning one thread for each connection cleanup avoids spending time
         -- waiting for locks and cleanup logic that could delay closing the
         -- connections and making us not respecting certain timeouts.
-        asyncs <- State.traverseMaybeWithKey
-          -- TODO: remove first argument!
-          (\_peerAddrOrConnId MutableConnState { connStateId, connVar } -> do
+        asyncs <- State.traverseMaybe
+          (\MutableConnState { connStateId, connVar } -> do
             -- cleanup handler for that thread will close socket associated
             -- with the thread.  We put each connection in 'TerminatedState' to
             -- try that none of the connection threads will enter