Minor refactor.

1 files changed, 15 insertions, 12 deletions

diff --git a/dht/src/Network/Tox/DHT/Handlers.hs b/dht/src/Network/Tox/DHT/Handlers.hs
index 5156ec44..73bc2229 100644
--- a/dht/src/Network/Tox/DHT/Handlers.hs
+++ b/dht/src/Network/Tox/DHT/Handlers.hs
@@ -445,30 +445,33 @@ updateRouting client routing orouter naddr0 msg
         forM_ m $ mapM_ $ \NodeInfoCallback{interestingNodeId,observedAddress} -> do
             when (interestingNodeId == nodeId naddr)
                 $ observedAddress now naddr
-    case prefer4or6 (Multi.UDP ==> naddr) Nothing of
-        Want_IP4 -> updateTable client naddr orouter (committee4 routing) (refresher4 routing)
-        Want_IP6 -> updateTable client naddr orouter (committee6 routing) (refresher6 routing)
-        Want_Both -> do dput XMisc "BUG:unreachable"
-                        error $ "BUG:unreachable at " ++ __FILE__ ++ ":" ++ show __LINE__
+    updateTable client routing orouter naddr
 
-updateTable :: Client -> NodeInfo
+updateTable :: Client -> Routing
                       -> (TVar (R.BucketList NodeInfo) -> RoutingTransition NodeInfo -> STM ())
-                      -> TriadCommittee NodeId SockAddr
-                      -> BucketRefresher NodeId NodeInfo
+                      -> NodeInfo
                       -> IO ()
-updateTable client naddr orouter committee refresher = do
+updateTable client routing orouter naddr = do
+    case prefer4or6 (Multi.UDP ==> naddr) Nothing of
+        Want_IP4 -> go (committee4 routing) (refresher4 routing)
+        Want_IP6 -> go (committee6 routing) (refresher6 routing)
+        Want_Both -> do dput XMisc "BUG:unreachable"
+                        error $ "BUG:unreachable at " ++ __FILE__ ++ ":" ++ show __LINE__
+ where
+    go :: TriadCommittee NodeId SockAddr -> BucketRefresher NodeId NodeInfo -> IO ()
+    go committee refresher = do
         self <- atomically $ R.thisNode <$> readTVar (refreshBuckets refresher)
         -- dput XMisc $ "(tox)updateRouting: " ++ show (nodeIP self, nodeIP naddr)
         when (self /= naddr) $ do
             -- TODO: IP address vote?
-            insertNode (toxKademlia client committee orouter refresher) naddr
+            insertNode (toxKademlia client orouter committee refresher) naddr
 
 toxKademlia :: Client
-                -> TriadCommittee NodeId SockAddr
                 -> (TVar (R.BucketList NodeInfo) -> RoutingTransition NodeInfo -> STM ())
+                -> TriadCommittee NodeId SockAddr
                 -> BucketRefresher NodeId NodeInfo
                 -> Kademlia NodeId NodeInfo
-toxKademlia client committee orouter refresher
+toxKademlia client orouter committee refresher
     = Kademlia quietInsertions
                toxSpace
                (vanillaIO (refreshBuckets refresher) $ pingUDP client)