1 files changed, 18 insertions, 18 deletions

diff --git a/kad/src/Network/Kademlia/Bootstrap.hs b/kad/src/Network/Kademlia/Bootstrap.hs
index c07b3c6c..bd09214f 100644
--- a/kad/src/Network/Kademlia/Bootstrap.hs
+++ b/kad/src/Network/Kademlia/Bootstrap.hs
@@ -52,7 +52,7 @@ type SensibleNodeId nid ni =
                  , Hashable nid
                  , Hashable ni )
 
-data BucketRefresher nid ni = forall tok addr. Ord addr =>  BucketRefresher
+data BucketRefresher nid ni qk = forall tok addr. Ord addr =>  BucketRefresher
     { -- | A staleness threshold (if a bucket goes this long without being
       -- touched, a refresh will be triggered).
       refreshInterval  :: POSIXTime
@@ -63,7 +63,7 @@ data BucketRefresher nid ni = forall tok addr. Ord addr =>  BucketRefresher
       -- priority in this priority search queue.
     , refreshQueue     :: TVar (Int.PSQ POSIXTime)
       -- | This is the kademlia node search specification.
-    , refreshSearch    :: Search nid addr tok ni ni
+    , refreshSearch    :: Search nid addr tok ni ni qk
       -- | The current kademlia routing table buckets.
     , refreshBuckets   :: TVar (R.BucketList ni)
       -- | Action to ping a node.  This is used only during initial bootstrap
@@ -84,9 +84,9 @@ data BucketRefresher nid ni = forall tok addr. Ord addr =>  BucketRefresher
 newBucketRefresher :: ( Ord addr, Hashable addr
                       , SensibleNodeId nid ni )
                     => TVar (R.BucketList ni)
-                    -> Search nid addr tok ni ni
+                    -> Search nid addr tok ni ni qk
                     -> (ni -> IO Bool)
-                    -> STM (BucketRefresher nid ni)
+                    -> STM (BucketRefresher nid ni qk)
 newBucketRefresher bkts sch ping = do
     let spc    = searchSpace sch
         nodeId = kademliaLocation spc
@@ -112,9 +112,9 @@ newBucketRefresher bkts sch ping = do
 -- insufficiently polymorphic field" when trying to update the existentially
 -- quantified field 'refreshSearch'.
 updateRefresherIO :: Ord addr
-                     => Search nid addr tok ni ni
+                     => Search nid addr tok ni ni qk
                      -> (ni -> IO Bool)
-                     -> BucketRefresher nid ni ->  BucketRefresher nid ni
+                     -> BucketRefresher nid ni qk ->  BucketRefresher nid ni qk
 updateRefresherIO sch ping BucketRefresher{..} = BucketRefresher
     { refreshSearch      = sch
     , refreshPing        = ping
@@ -128,7 +128,7 @@ updateRefresherIO sch ping BucketRefresher{..} = BucketRefresher
     }
 
 -- | Fork a refresh loop.  Kill the returned thread to terminate it.
-forkPollForRefresh :: SensibleNodeId nid ni => BucketRefresher nid ni -> IO ThreadId
+forkPollForRefresh :: Ord qk => SensibleNodeId nid ni => BucketRefresher nid ni qk -> IO ThreadId
 forkPollForRefresh r@BucketRefresher{ refreshInterval
                                     , refreshQueue
                                     , refreshBuckets
@@ -194,7 +194,7 @@ checkBucketFull space var resultCounter fin n found_node = do
 
 -- | Called from 'refreshBucket' with the current time when a refresh of the
 -- supplied bucket number finishes.
-onFinishedRefresh :: BucketRefresher nid ni -> Int -> POSIXTime -> STM (IO ())
+onFinishedRefresh :: BucketRefresher nid ni qk -> Int -> POSIXTime -> STM (IO ())
 onFinishedRefresh BucketRefresher { bootstrapCountdown
                                   , bootstrapMode
                                   , refreshQueue
@@ -235,11 +235,11 @@ onFinishedRefresh BucketRefresher { bootstrapCountdown
         return $ do action ; dput XRefresh $ "BOOTSTRAP complete (" ++ show (R.shape tbl) ++ ")."
     else return $ do action ; dput XRefresh $ "BOOTSTRAP progress " ++ show (num,R.shape tbl,cnt)
 
-data BucketSearch nid ni = forall addr tok. BucketSearch
+data BucketSearch nid ni = forall addr tok qk. BucketSearch
     { bucketSample  :: nid
     , bucketResults :: TVar (Set.Set ni)
     , bucketFinFlag :: TVar Bool
-    , bucketState   :: SearchState nid addr tok ni ni
+    , bucketState   :: SearchState nid addr tok ni ni qk
     , bucketThread  :: ThreadId
     }
 
@@ -253,8 +253,8 @@ insertBucketState :: BucketSearch nid ni -> Maybe [BucketSearch nid ni] -> Maybe
 insertBucketState bst Nothing   = Just [bst]
 insertBucketState bst (Just xs) = Just (bst : xs)
 
-refreshBucket :: (Show nid, Ord ni, Ord nid, Hashable nid, Hashable ni) =>
-                 BucketRefresher nid ni -> Int -> IO Int
+refreshBucket :: (Show nid, Ord ni, Ord nid, Hashable nid, Hashable ni, Ord qk) =>
+                 BucketRefresher nid ni qk -> Int -> IO Int
 refreshBucket r@BucketRefresher{ refreshSearch  = sch
                                , refreshBuckets = var
                                , refreshState   = rstate }
@@ -297,7 +297,7 @@ refreshBucket r@BucketRefresher{ refreshSearch  = sch
         return $ if b then 1 else c
     return rcount
 
-refreshLastBucket :: SensibleNodeId nid ni => BucketRefresher nid ni -> IO ()
+refreshLastBucket :: SensibleNodeId nid ni => BucketRefresher nid ni qk -> IO ()
 refreshLastBucket r@BucketRefresher { refreshBuckets
                                     , refreshQueue   } = do
 
@@ -308,7 +308,7 @@ refreshLastBucket r@BucketRefresher { refreshBuckets
     modifyTVar' refreshQueue $ Int.insert (cnt-1) (now - 1)
 
 restartBootstrap :: (Hashable ni, Hashable nid, Ord ni, Ord nid, Show nid) =>
-                 BucketRefresher nid ni -> STM (IO ())
+                 BucketRefresher nid ni qk -> STM (IO ())
 restartBootstrap r@BucketRefresher{ bootstrapMode, bootstrapCountdown } = do
     unchanged <- readTVar bootstrapMode
     writeTVar bootstrapMode True
@@ -319,7 +319,7 @@ restartBootstrap r@BucketRefresher{ bootstrapMode, bootstrapCountdown } = do
                      else return $ dput XRefresh "BOOTSTRAP already bootstrapping"
 
 bootstrap :: (Ord ni, Ord nid, Hashable nid, Hashable ni, Foldable t, Foldable t1, Show nid) =>
-             BucketRefresher nid ni
+             BucketRefresher nid ni qk
              -> t1 ni -- ^ Nodes to bootstrap from.
              -> t ni  -- ^ Fallback nodes; used only if the others are unresponsive.
              -> IO ()
@@ -356,7 +356,7 @@ bootstrap r@BucketRefresher { refreshSearch  = sch
     -- maintenance.
 
 
-effectiveRefreshInterval :: BucketRefresher nid ni -> Int -> STM POSIXTime
+effectiveRefreshInterval :: BucketRefresher nid ni qk -> Int -> STM POSIXTime
 effectiveRefreshInterval BucketRefresher{ refreshInterval
                                         , refreshBuckets
                                         , bootstrapMode   } num = do
@@ -429,7 +429,7 @@ effectiveRefreshInterval BucketRefresher{ refreshInterval
 -- We embed the result in the STM monad but currently, no STM state changes
 -- occur until the returned IO action is invoked.  TODO: simplify?
 touchBucket :: SensibleNodeId nid ni
-            => BucketRefresher nid ni
+            => BucketRefresher nid ni qk
             -> RoutingTransition ni     -- ^ What happened to the bucket?
             -> STM (IO ())
 touchBucket r@BucketRefresher{ refreshSearch
@@ -461,7 +461,7 @@ touchBucket r@BucketRefresher{ refreshSearch
             writeTVar refreshLastTouch now
             return action
 
-refreshKademlia :: SensibleNodeId nid ni => BucketRefresher nid ni -> Kademlia nid ni
+refreshKademlia :: SensibleNodeId nid ni => BucketRefresher nid ni qk -> Kademlia nid ni
 refreshKademlia r@BucketRefresher { refreshSearch  = sch
                                   , refreshPing    = ping
                                   , refreshBuckets = bkts