1 files changed, 15 insertions, 15 deletions

diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index d3d36525..c1f57177 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -150,24 +150,24 @@ newRouting addr crypto update4 update6 = do
                     SockAddrInet {} -> return Nothing
                     _               -> global6
     atomically $ do
-        let nobkts = R.defaultBucketCount :: Int
-        tbl4 <- newTVar $ R.nullTable (comparing nodeId) (\s -> hashWithSalt s . nodeId) tentative_info4 nobkts
-        tbl6 <- newTVar $ R.nullTable (comparing nodeId) (\s -> hashWithSalt s . nodeId) tentative_info6 nobkts
+        -- We defer initializing the refreshSearch and refreshPing until we
+        -- have a client to send queries with.
+        let nullPing = const $ return False
+            nullSearch = Search
+                { searchSpace       = toxSpace
+                , searchNodeAddress = nodeIP &&& nodePort
+                , searchQuery       = \_ _ -> return Nothing
+                }
+        refresher4 <- newBucketRefresher toxSpace tentative_info nullSearch nullPing
+        refresher6 <- newBucketRefresher toxSpace tentative_info6 nullSearch nullPing
+        let tbl4 = refreshBuckets refresher4
+            tbl6 = refreshBuckets refresher6
         committee4 <- newTriadCommittee (update4 tbl4) -- updateIPVote tbl4 addr4
         committee6 <- newTriadCommittee (update6 tbl6) -- updateIPVote tbl6 addr6
-        sched4 <- newTVar Int.empty
-        sched6 <- newTVar Int.empty
         return $ \client ->
-            let refresher sched bkts = BucketRefresher
-                    { refreshInterval = 15 * 60
-                    , refreshQueue    = sched
-                    , refreshSearch   = nodeSearch client
-                    , refreshBuckets  = bkts
-                    , refreshPing     = ping client
-                    }
-                refresher4 = refresher sched4 tbl6
-                refresher6 = refresher sched6 tbl6
-            in Routing tentative_info committee4 committee6 refresher4 refresher6
+            -- Now we have a client, so tell the BucketRefresher how to search and ping.
+            let updIO r = updateRefresherIO (nodeSearch client) (ping client) r
+            in Routing tentative_info committee4 committee6 (updIO refresher4) (updIO refresher6)
 
 
 -- TODO: This should cover more cases