Refactoring.

1 files changed, 21 insertions, 11 deletions

diff --git a/Kademlia.hs b/Kademlia.hs
index 40874078..7bffe4c1 100644
--- a/Kademlia.hs
+++ b/Kademlia.hs
@@ -111,15 +111,6 @@ contramapIR f ir = InsertionReporter
     , reportPingResult = \tm ni b -> reportPingResult ir tm (f ni) b
     }
 
-data KademliaSpace nid ni = KademliaSpace
-    { kademliaLocation :: ni -> nid
-    , kademliaTestBit :: nid -> Word -> Bool
-    }
-
-contramapKS f ks = ks
-    { kademliaLocation = kademliaLocation ks . f
-    }
-
 -- | All the IO operations neccessary to maintain a Kademlia routing table.
 data TableStateIO nid ni = TableStateIO
     { -- | Write the routing table.  Typically 'writeTVar'.
@@ -145,10 +136,29 @@ data TableStateIO nid ni = TableStateIO
     , tblChanged :: RoutingTableChanged ni -> STM (IO ())
     }
 
+vanillaIO :: TVar (Table ni nid) -> (ni -> IO Bool) -> TableStateIO nid ni
+vanillaIO var ping = TableStateIO
+    { tblRead = readTVar var
+    , tblWrite = writeTVar var
+    , tblPing = ping
+    , tblChanged = const $ return $ return ()
+    }
+
+-- | Everything neccessary to maintain a routing table of /ni/ (node
+-- information) entries.
 data Kademlia nid ni = Kademlia (InsertionReporter ni)
                                 (KademliaSpace nid ni)
                                 (TableStateIO nid ni)
 
+{-
+kademlia :: FiniteBits nid =>
+            TVar (Table nid nid) -> (nid -> IO Bool) -> Kademlia nid nid
+kademlia var ping = Kademlia quietInsertions
+                             (KademliaSpace id testIdBit)
+                             (vanillaIO var ping)
+
+-}
+
 insertNode ::
     forall ni nid.  Ord ni =>
     Kademlia nid ni
@@ -160,7 +170,7 @@ insertNode (Kademlia reporter space io) node = do
 
   (ps,reaction) <- atomically $ do
     tbl <- tblRead io
-    let (inserted, ps,t') = R.updateForInbound (kademliaTestBit space) (kademliaLocation space) tm node tbl
+    let (inserted, ps,t') = R.updateForInbound space tm node tbl
     tblWrite io t'
     reaction <- if inserted
                     then tblChanged io $ RoutingTableChanged Nothing node tm
@@ -177,7 +187,7 @@ insertNode (Kademlia reporter space io) node = do
         reportPingResult reporter tm n b
         join $ atomically $ do
             tbl <- tblRead io
-            let (replacements, t') = R.updateForPingResult (kademliaTestBit space) (kademliaLocation space) n b tbl
+            let (replacements, t') = R.updateForPingResult space n b tbl
             tblWrite io t'
             sequence <$> mapM (\(x,(t,y)) -> tblChanged io $ RoutingTableChanged (Just x) y t)
                               replacements