Refactored findNode to use nodeBools function

Bucket.hs

@@ -7,8 +7,9 @@ import Data.Ord (comparing)
 import Data.Bits
 import Data.LargeWord (Word160)
 
+-- Returns the left to right index of the first high bit in the input
 firstHighBit :: Word160 -> Int
-firstHighBit n = case findIndex (`testBit` 159) . take 160 $ iterate (*2) n of
+firstHighBit n = case findIndex id $ nodeBools n of
               Just i -> i
               Nothing -> 160
 
@@ -32,10 +33,11 @@ addNode new (BucketTable local bucket) = let
 findNode :: (NodeID a) => a -> BucketTable -> Maybe Node
 findNode target (BucketTable local buckets) =
     find (nodeEq target) bucket
-    where bucket = case drop index buckets of
-                        (b:_) -> b
-                        [] -> last buckets
-          index = firstHighBit $ nodeDist target local
+    where
+    bucket = case filter fst $ zip bools buckets of
+                  ((_,b):_) -> b
+                  [] -> last buckets
+    bools = nodeBools $ nodeDist local target
 
 getNear :: (NodeID a) => a -> BucketTable -> [Node]
 getNear target (BucketTable _ bs) =

Node.hs

@@ -1,8 +1,10 @@
 
 {-# LANGUAGE TypeSynonymInstances #-}
 
-module Data.DHT.Node
-    (Node, NodeID, nodeID, isGood, lastSeen, nodeEq, nodeBit, nodeDist) where
+module Data.DHT.Node (
+    NodeID, nodeID,
+    Node, isGood, lastSeen,
+    nodeBools, nodeEq, nodeBit, nodeDist) where
 
 import Data.Bits
 import Data.LargeWord (Word160)
@@ -31,4 +33,6 @@ nodeBit i = (`testBit` i) . nodeID
 nodeDist :: (NodeID a, NodeID b) => a -> b -> Word160
 nodeDist local target = nodeID local `xor` nodeID target
 
+nodeBools :: (NodeID a) => a -> [Bool]
+nodeBools node = map (`nodeBit` node) $ reverse [0..159]