Switched PSQueue to psqueues for strict spine.

2 files changed, 8 insertions, 11 deletions

diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index ea3b96f0..26bdeae9 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -12,7 +12,7 @@ import Data.List as L
 import Data.Maybe
 import Data.HashMap.Strict as HM
 import Data.Serialize
-import Data.PSQueue as PSQ
+import Data.Wrapper.PSQ as PSQ
 import Data.Time.Clock.POSIX
 import Data.ByteString (ByteString)
 import Data.Word
diff --git a/src/Network/BitTorrent/DHT/Routing.hs b/src/Network/BitTorrent/DHT/Routing.hs
index d64e415e..3c2e30aa 100644
--- a/src/Network/BitTorrent/DHT/Routing.hs
+++ b/src/Network/BitTorrent/DHT/Routing.hs
@@ -70,7 +70,7 @@ import Data.Functor.Identity
 import Data.List as L hiding (insert)
 import Data.Maybe
 import Data.Monoid
-import Data.PSQueue as PSQ
+import Data.Wrapper.PSQ as PSQ
 import Data.Serialize as S hiding (Result, Done)
 import qualified Data.Sequence as Seq
 import Data.Time
@@ -181,10 +181,6 @@ runRouting ping_node find_nodes timestamper = go
 -- | Timestamp - last time this node is pinged.
 type NodeEntry ip = Binding (NodeInfo ip) Timestamp
 
-instance (Serialize k, Serialize v) => Serialize (Binding k v) where
-  get = (:->) <$> get <*> get
-  put (k :-> v) = put k >> put v
-
 -- TODO instance Pretty where
 
 -- | Number of nodes in a bucket.
@@ -239,12 +235,13 @@ data Bucket ip = Bucket { bktNodes :: PSQ (NodeInfo ip) Timestamp
                         , bktQ     :: BucketQueue ip
                         } deriving (Show,Generic)
 
-instance (Eq ip, Serialize ip) => Serialize (Bucket ip)
+instance (Eq ip, Serialize ip) => Serialize (Bucket ip) where
+    get = Bucket . psqFromPairList <$> get <*> pure (runIdentity $ emptyQueue bucketQ)
+    put = put . psqToPairList . bktNodes
+
+psqFromPairList xs = PSQ.fromList $ map (\(a,b) -> a :-> b) xs
 
-instance (Serialize k, Serialize v, Ord k, Ord v)
-       => Serialize (PSQ k v) where
-  get = PSQ.fromList <$> get
-  put = put . PSQ.toList
+psqToPairList psq = map (\(a :-> b) -> (a,b)) $ PSQ.toList psq
 
 -- | Update interval, in seconds.
 delta :: NominalDiffTime