Update MinMaxPSQ to use HashPSQ.

1 files changed, 8 insertions, 5 deletions

diff --git a/src/Network/BitTorrent/DHT/Search.hs b/src/Network/BitTorrent/DHT/Search.hs
index 356f6fd9..07240755 100644
--- a/src/Network/BitTorrent/DHT/Search.hs
+++ b/src/Network/BitTorrent/DHT/Search.hs
@@ -23,7 +23,7 @@ import System.IO
 import qualified Data.MinMaxPSQ   as MM
          ;import Data.MinMaxPSQ   (MinMaxPSQ)
 import qualified Data.Wrapper.PSQ as PSQ
-         ;import Data.Wrapper.PSQ (pattern (:->), Binding, PSQ)
+         ;import Data.Wrapper.PSQ (pattern (:->), Binding, PSQ, PSQKey)
 import Network.Address hiding (NodeId)
 import Network.DatagramServer.Types
 import Data.Bits
@@ -39,7 +39,8 @@ data IterativeSearch dht u ip r = IterativeSearch
     }
 
 newSearch :: ( Eq ip
-             , Ord (NodeId dht)
+             , PSQKey (NodeId dht)
+             , PSQKey (NodeInfo dht ip u)
              , FiniteBits (NodeId dht)
              ) => (NodeInfo dht ip u -> IO ([NodeInfo dht ip u], [r]))
                       -> NodeId dht -> [NodeInfo dht ip u] -> IO (IterativeSearch dht u ip r)
@@ -60,7 +61,8 @@ searchK = 8
 sendQuery :: forall a ip dht u.
             ( Ord a
             , Ord ip
-            , Ord (NodeId dht)
+            , PSQKey (NodeId dht)
+            , PSQKey (NodeInfo dht ip u)
             , FiniteBits (NodeId dht)
             ) =>
             IterativeSearch dht u ip a
@@ -85,7 +87,8 @@ sendQuery IterativeSearch{..} (ni :-> d) = do
 
 
 searchIsFinished :: ( Ord ip
-                    , Ord (NodeId dht)
+                    , PSQKey (NodeId dht)
+                    , PSQKey (NodeInfo dht ip u)
                     ) => IterativeSearch dht u ip r -> STM Bool
 searchIsFinished IterativeSearch{..} = do
     q <- readTVar searchQueued
@@ -98,7 +101,7 @@ searchIsFinished IterativeSearch{..} = do
                             <= PSQ.prio (fromJust $ MM.findMin q))))
 
 search ::
-    (Ord r, Ord ip, Ord (NodeId dht), FiniteBits (NodeId dht)) =>
+    (Ord r, Ord ip, PSQKey (NodeId dht), PSQKey (NodeInfo dht ip u), FiniteBits (NodeId dht)) =>
     IterativeSearch dht u ip r -> IO ()
 search s@IterativeSearch{..} = withTaskGroup searchAlpha $ \g -> do
     fix $ \again -> do