Removed redundant argument from BucketRefreshser constructor.

3 files changed, 9 insertions, 9 deletions

diff --git a/src/Network/BitTorrent/MainlineDHT.hs b/src/Network/BitTorrent/MainlineDHT.hs
index 47d5b3e1..f43b070c 100644
--- a/src/Network/BitTorrent/MainlineDHT.hs
+++ b/src/Network/BitTorrent/MainlineDHT.hs
@@ -562,8 +562,8 @@ newClient swarms addr = do
         -- have a client to send queries with.
         let nullPing = const $ return False
             nullSearch = mainlineSearch $ \_ _ -> return Nothing
-        refresher4 <- newBucketRefresher mainlineSpace tentative_info nullSearch nullPing
-        refresher6 <- newBucketRefresher mainlineSpace tentative_info6 nullSearch nullPing
+        refresher4 <- newBucketRefresher tentative_info nullSearch nullPing
+        refresher6 <- newBucketRefresher tentative_info6 nullSearch nullPing
         let tbl4 = refreshBuckets refresher4
             tbl6 = refreshBuckets refresher6
             updateIPVote tblvar addrvar a = do
diff --git a/src/Network/Kademlia/Bootstrap.hs b/src/Network/Kademlia/Bootstrap.hs
index 87fdc22f..3540b24e 100644
--- a/src/Network/Kademlia/Bootstrap.hs
+++ b/src/Network/Kademlia/Bootstrap.hs
@@ -73,14 +73,14 @@ data BucketRefresher nid ni = forall tok addr. Ord addr =>  BucketRefresher
     , refreshPing     :: ni -> IO Bool
     }
 
-newBucketRefresher :: (Ord addr, Ord a, Hashable a)
-                    => KademliaSpace a ni
-                    -> ni
+newBucketRefresher :: (Ord addr, Hashable addr, SensibleNodeId nid ni)
+                    => ni
                     -> Search nid addr tok ni ni
                     -> (ni -> IO Bool)
                     -> STM (BucketRefresher nid ni)
-newBucketRefresher spc template_ni sch ping = do
-    let nodeId = kademliaLocation spc
+newBucketRefresher template_ni sch ping = do
+    let spc    = searchSpace sch
+        nodeId = kademliaLocation spc
     bkts <- newTVar $ R.nullTable (comparing nodeId) (\s -> hashWithSalt s . nodeId) template_ni R.defaultBucketCount
     sched <- newTVar Int.empty
     return  BucketRefresher
diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index c1f57177..7f3bc7ed 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -158,8 +158,8 @@ newRouting addr crypto update4 update6 = do
                 , searchNodeAddress = nodeIP &&& nodePort
                 , searchQuery       = \_ _ -> return Nothing
                 }
-        refresher4 <- newBucketRefresher toxSpace tentative_info nullSearch nullPing
-        refresher6 <- newBucketRefresher toxSpace tentative_info6 nullSearch nullPing
+        refresher4 <- newBucketRefresher tentative_info nullSearch nullPing
+        refresher6 <- newBucketRefresher tentative_info6 nullSearch nullPing
         let tbl4 = refreshBuckets refresher4
             tbl6 = refreshBuckets refresher6
         committee4 <- newTriadCommittee (update4 tbl4) -- updateIPVote tbl4 addr4