Removed broken bktCount parameter to BucketList.

1 files changed, 20 insertions, 26 deletions

diff --git a/src/Network/DHT/Routing.hs b/src/Network/DHT/Routing.hs
index 46ebe472..63ff46c7 100644
--- a/src/Network/DHT/Routing.hs
+++ b/src/Network/DHT/Routing.hs
@@ -415,16 +415,14 @@ deriving instance (Show ni, Show nid) => Show (Info ni nid)
 --
 data BucketList ni = forall s. Reifies s (Compare ni) =>
     BucketList { thisNode :: !ni
-               , bktCount :: !Int
                  -- | Non-empty list of buckets.
                , buckets :: [Bucket s ni]
                }
 
 mapTable :: (b -> t) -> (t -> b) -> BucketList t -> BucketList b
-mapTable g f tbl@(BucketList self n bkts) = reify (contramapC g $ bucketCompare bkts)
+mapTable g f tbl@(BucketList self bkts) = reify (contramapC g $ bucketCompare bkts)
     $ \p -> BucketList
         { thisNode = f self
-        , bktCount = n
         , buckets = map (resolve p . mapBucket f) bkts
         }
  where
@@ -446,11 +444,9 @@ instance Serialize NominalDiffTime where
 deriving instance (Show ni) => Show (BucketList ni)
 #else
 instance Show ni => Show (BucketList ni) where
-    showsPrec d (BucketList self cnt bkts) =
+    showsPrec d (BucketList self bkts) =
         mappend "BucketList "
         . showsPrec (d+1) self
-        . mappend " "
-        . showsPrec (d+1) cnt
         . mappend " (fromList "
         . showsPrec (d+1) (L.map (L.map tableEntry . PSQ.toList . bktNodes) $ bkts)
         . mappend ") "
@@ -484,11 +480,8 @@ nullTable cmp hsh ni n =
     reify (Compare cmp hsh)
         $ \p -> BucketList
                     ni
-                    (bucketCount (pred n))
                     [Bucket (empty p) (runIdentity $ emptyQueue bucketQ)]
   where
-    bucketCount x = max 0 (min 159 x)
-
     empty :: Reifies s (Compare ni) => Proxy s -> PSQ (Ordered s ni) Timestamp
     empty = const $ PSQ.empty
 
@@ -521,7 +514,7 @@ type NodeCount   = Int
 -- | Internally, routing table is similar to list of buckets or a
 -- /matrix/ of nodes. This function returns the shape of the matrix.
 shape :: BucketList ni -> [Int]
-shape (BucketList _ _ tbl) = map (PSQ.size . bktNodes) tbl
+shape (BucketList _ tbl) = map (PSQ.size . bktNodes) tbl
 
 #if 0
 
@@ -539,7 +532,7 @@ lookupBucket :: forall ni nid x.
                 ( -- FiniteBits nid
                  Ord nid
                 ) => KademliaSpace nid ni -> nid -> (forall s. Reifies s (Compare ni) => [Bucket s ni] -> x) -> BucketList ni -> x
-lookupBucket space nid kont (BucketList self _ bkts) = kont $ go 0 [] bkts
+lookupBucket space nid kont (BucketList self bkts) = kont $ go 0 [] bkts
   where
     d = kademliaXor space nid (kademliaLocation space self)
 
@@ -551,7 +544,7 @@ lookupBucket space nid kont (BucketList self _ bkts) = kont $ go 0 [] bkts
 
 bucketNumber :: forall ni nid.
                 KademliaSpace nid ni -> nid -> BucketList ni -> Int
-bucketNumber space nid (BucketList self _ bkts) = fromIntegral $ go 0 bkts
+bucketNumber space nid (BucketList self bkts) = fromIntegral $ go 0 bkts
   where
     d = kademliaXor space nid (kademliaLocation space self)
 
@@ -582,12 +575,12 @@ tablePrefix testbit = map (packByte . take 8 . (++repeat False))
     bitmask _  _    = 0
 
 tableBits :: (ni -> Word -> Bool) -> BucketList ni -> [Bool]
-tableBits testbit (BucketList self _ bkts) =
+tableBits testbit (BucketList self bkts) =
     zipWith const (map (testbit self) [0..])
                   bkts
 
 selfNode :: BucketList ni -> ni
-selfNode (BucketList self _ _) = self
+selfNode (BucketList self _) = self
 
 chunksOf :: Int -> [e] -> [[e]]
 chunksOf i ls = map (take i) (build (splitter ls)) where
@@ -654,8 +647,8 @@ kclosest space k nid tbl = take k $ rank space nid (L.concat bucket)
 splitTip :: -- ( Eq ip , Ord (NodeId) , FiniteBits (NodeId)) =>
             ( Reifies s (Compare ni) ) =>
             (ni -> Word -> Bool)
-            -> ni -> Int -> BitIx -> Bucket s ni -> [ Bucket s ni ]
-splitTip testNodeBit ni n i bucket
+            -> ni -> BitIx -> Bucket s ni -> [ Bucket s ni ]
+splitTip testNodeBit ni i bucket
   | testNodeBit ni i = [zeros , ones ]
   |    otherwise     = [ones , zeros ]
   where
@@ -671,22 +664,23 @@ modifyBucket
     forall ni nid xs.
     KademliaSpace nid ni
     -> nid -> (forall s. Reifies s (Compare ni) => Bucket s ni -> Maybe (xs, Bucket s ni)) -> BucketList ni -> Maybe (xs,BucketList ni)
-modifyBucket space nid f (BucketList self n bkts)
-    = second (BucketList self n) <$> go (0 :: BitIx) bkts
+modifyBucket space nid f (BucketList self bkts)
+    = second (BucketList self) <$> go (0 :: BitIx) bkts
   where
     d = kademliaXor space nid (kademliaLocation space self)
 
     -- go :: BitIx -> [Bucket s ni] -> Maybe (xs, [Bucket s ni])
 
     go !i (bucket : buckets@(_:_))
-      | kademliaTestBit space d i = second (bucket :)  <$> go (succ i) buckets
-      |       otherwise           = second (: buckets) <$> f bucket
+      | kademliaTestBit space d i = second (: buckets) <$> f bucket
+      |       otherwise           = second (bucket :)  <$> go (succ i) buckets
+
+    go !i [bucket] = second (: []) <$> f bucket
+                     <|>  go i (splitTip (kademliaTestBit space . kademliaLocation space) self i bucket)
 
-    go !i [bucket]
-      |      (n == 0) = second (: []) <$> f bucket
-      |     otherwise = second (: []) <$> f bucket
-                        <|>  go i (splitTip (kademliaTestBit space . kademliaLocation space) self n i bucket)
 
+bktCount :: BucketList ni -> Int
+bktCount (BucketList _ bkts) = L.length bkts
 
 -- | Triggering event for atomic table update
 data Event ni = TryInsert  { foreignNode :: ni }
@@ -735,7 +729,7 @@ deriving instance ( Show ip
 updateForInbound ::
     KademliaSpace nid ni
     -> Timestamp -> ni -> BucketList ni -> (Bool, [ni], BucketList ni)
-updateForInbound space tm ni tbl@(BucketList _ _ bkts) =
+updateForInbound space tm ni tbl@(BucketList _ bkts) =
     maybe (False, [],tbl) (\(ps,tbl') -> (True, ps, tbl'))
                    $ modifyBucket space
                                    (kademliaLocation space ni)
@@ -770,7 +764,7 @@ tableEntry :: NodeEntry ni -> TableEntry ni
 tableEntry (a :-> b) = (a, b)
 
 toList :: BucketList ni -> [[TableEntry ni]]
-toList (BucketList _ _ bkts) = coerce $ L.map (L.map tableEntry . PSQ.toList . bktNodes) bkts
+toList (BucketList _ bkts) = coerce $ L.map (L.map tableEntry . PSQ.toList . bktNodes) bkts
 
 data KademliaSpace nid ni = KademliaSpace
     { -- | Given a node record (probably including IP address), yields a