Use Data.Reflection for PSQ-required Ord instance.

1 files changed, 5 insertions, 72 deletions

diff --git a/Kademlia.hs b/Kademlia.hs
index 4a811fa2..0caba720 100644
--- a/Kademlia.hs
+++ b/Kademlia.hs
@@ -15,6 +15,7 @@ import Control.Concurrent.Lifted.Instrument
 import GHC.Conc (labelThread)
 import Control.Concurrent.Lifted
 #endif
+import Data.Bits
 
 import Text.PrettyPrint as PP hiding ((<>), ($$))
 import Text.PrettyPrint.HughesPJClass hiding ((<>),($$))
@@ -24,61 +25,6 @@ import Control.Monad
 import Data.Monoid
 import Data.Time.Clock.POSIX (POSIXTime)
 
-{-
-insertNode1 :: forall raw dht u ip.
-               ( Address ip
-               , Default u
-               , Show u
-               , Ord (NodeId dht)
-               , FiniteBits (NodeId dht)
-               , Show (NodeId dht)
-               , KRPC dht (Query dht (Ping dht)) (Response dht (Ping dht))
-               , DHT.Kademlia dht
-               , Ord (TransactionID dht)
-               , WireFormat raw dht
-               , Serialize (TransactionID dht)
-               , SerializableTo raw (Response dht (Ping dht))
-               , SerializableTo raw (Query dht (Ping dht))
-               , Ord (NodeId dht)
-               , Show (NodeId dht)
-               , Show (QueryMethod dht)
-               ) => DHT raw dht u ip (NodeInfo dht ip u -> Maybe ReflectedIP -> IO ())
--}
-{-
-insertNode1 = do
-      params = DHT.TableParameters
-        { maxBuckets = R.defaultBucketCount :: Int
-        , fallbackID = myid
-        , adjustID = dhtAdjustID Proxy (DHT.fallbackID params) :: SockAddr -> Event dht ip u -> NodeId dht
-        , logMessage = (\ _ _ -> return ()) {- TODO -} :: Char -> String -> IO ()
-        , pingProbe = error "probe" :: ni -> NodeInfo dht ip u -> IO (Bool, Maybe ReflectedIP)
-        }
-  let state = DHT.TableKeeper
-        { routingInfo = tbl
-        , grokNode    = DHT.insertNode params state
-        , grokAddress = \_ _ -> return () -- :: Maybe SockAddr -> ReflectedIP -> IO ()
-        }
-  return $ \info witnessed_ip0 -> DHT.insertNode params state info witnessed_ip0
-
--}
-
-{-
-insertNode :: forall msg ip u.
-                ( Address ip
-                , Show u
-                , Show (NodeId msg)
-                , Ord (NodeId msg)
-                , FiniteBits (NodeId msg)
-                ) => TableParameters msg ip u -> TableKeeper msg ip u -> NodeInfo msg ip u -> Maybe ReflectedIP -> IO ()
--}
-  {-
-  let showTable = do
-        t <- atomically $ fmap myBuckets <$> readTVar routingInfo
-        let logMsg = "Routing table: " <> pPrint t
-        logMessage 'D' (render logMsg)
-      reportPingResult tm n b  = showTable
-      reportArrival tm info ps = showTable
-  -}
 
 -- | A change occured in the kademlia routing table.
 data RoutingTableChanged ni = RoutingTableChanged
@@ -138,9 +84,9 @@ data TableStateIO nid ni = TableStateIO
 
 vanillaIO :: TVar (BucketList ni) -> (ni -> IO Bool) -> TableStateIO nid ni
 vanillaIO var ping = TableStateIO
-    { tblRead = readTVar var
-    , tblWrite = writeTVar var
-    , tblPing = ping
+    { tblRead    = readTVar var
+    , tblWrite   = writeTVar var
+    , tblPing    = ping
     , tblChanged = const $ return $ return ()
     }
 
@@ -150,20 +96,7 @@ data Kademlia nid ni = Kademlia (InsertionReporter ni)
                                 (KademliaSpace nid ni)
                                 (TableStateIO nid ni)
 
-{-
-kademlia :: FiniteBits nid =>
-            TVar (BucketList 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
-    -> ni
-    -> IO ()
+insertNode :: Kademlia nid ni -> ni -> IO ()
 insertNode (Kademlia reporter space io) node = do
 
   tm <- utcTimeToPOSIXSeconds <$> getCurrentTime