3 files changed, 51 insertions, 46 deletions

diff --git a/src/Network/BitTorrent/Core/PeerAddr.hs b/src/Network/BitTorrent/Core/PeerAddr.hs
index 92fb83a7..e9ad7c96 100644
--- a/src/Network/BitTorrent/Core/PeerAddr.hs
+++ b/src/Network/BitTorrent/Core/PeerAddr.hs
@@ -26,9 +26,6 @@ module Network.BitTorrent.Core.PeerAddr
        , peerSocket
 
          -- * Peer storage
-       , PeerStore
-       , Network.BitTorrent.Core.PeerAddr.lookup
-       , Network.BitTorrent.Core.PeerAddr.insert
        ) where
 
 import Control.Applicative
@@ -39,11 +36,9 @@ import Data.ByteString.Char8 as BS8
 import Data.Char
 import Data.Default
 import Data.Hashable
-import Data.HashMap.Strict as HM
 import Data.IP
 import Data.List      as L
 import Data.List.Split
-import Data.Maybe
 import Data.Monoid
 import Data.Serialize as S
 import Data.String
@@ -55,7 +50,7 @@ import Text.PrettyPrint.Class
 import Text.Read (readMaybe)
 import qualified Text.ParserCombinators.ReadP as RP
 
-import Data.Torrent.InfoHash
+--import Data.Torrent
 import Network.BitTorrent.Core.PeerId
 
 
@@ -315,40 +310,3 @@ peerSocket socketType pa = do
     sock <- socket family socketType defaultProtocol
     connect sock addr
     return sock
-
-{-----------------------------------------------------------------------
---  Peer storage
------------------------------------------------------------------------}
--- TODO use more memory efficient representation
-
--- | Storage used to keep track a set of known peers in client,
--- tracker or DHT sessions.
-newtype PeerStore ip = PeerStore (HashMap InfoHash [PeerAddr ip])
-
--- | Empty store.
-instance Default (PeerStore a) where
-  def = PeerStore HM.empty
-  {-# INLINE def #-}
-
--- | Monoid under union operation.
-instance Eq a => Monoid (PeerStore a) where
-  mempty  = def
-  {-# INLINE mempty #-}
-
-  mappend (PeerStore a) (PeerStore b) =
-    PeerStore (HM.unionWith L.union a b)
-  {-# INLINE mappend #-}
-
--- | Can be used to store peers between invocations of the client
--- software.
-instance Serialize (PeerStore a) where
-  get = undefined
-  put = undefined
-
--- | Used in 'get_peers' DHT queries.
-lookup :: InfoHash -> PeerStore a -> [PeerAddr a]
-lookup ih (PeerStore m) = fromMaybe [] $ HM.lookup ih m
-
--- | Used in 'announce_peer' DHT queries.
-insert :: Eq a => InfoHash -> PeerAddr a -> PeerStore a -> PeerStore a
-insert ih a (PeerStore m) = PeerStore (HM.insertWith L.union ih [a] m)
diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index 028a4214..2aedf900 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -1,5 +1,19 @@
 module Network.BitTorrent.DHT.ContactInfo
-       (        ) where
+       ( PeerStore
+       , Network.BitTorrent.DHT.ContactInfo.lookup
+       , Network.BitTorrent.DHT.ContactInfo.insert
+       ) where
+
+import Data.Default
+import Data.List as L
+import Data.Maybe
+import Data.Monoid
+import Data.HashMap.Strict as HM
+import Data.Serialize
+
+import Data.Torrent.InfoHash
+import Network.BitTorrent.Core.PeerAddr
+
 {-
 import Data.HashMap.Strict as HM
 
@@ -90,4 +104,36 @@ prune pref targetSize (Tip _ _) = undefined
 -- | Remove expired entries.
 splitGT :: Timestamp -> ContactInfo ip -> ContactInfo ip
 splitGT = undefined
--}
\ No newline at end of file
+-}
+
+-- | Storage used to keep track a set of known peers in client,
+-- tracker or DHT sessions.
+newtype PeerStore ip = PeerStore (HashMap InfoHash [PeerAddr ip])
+
+-- | Empty store.
+instance Default (PeerStore a) where
+  def = PeerStore HM.empty
+  {-# INLINE def #-}
+
+-- | Monoid under union operation.
+instance Eq a => Monoid (PeerStore a) where
+  mempty  = def
+  {-# INLINE mempty #-}
+
+  mappend (PeerStore a) (PeerStore b) =
+    PeerStore (HM.unionWith L.union a b)
+  {-# INLINE mappend #-}
+
+-- | Can be used to store peers between invocations of the client
+-- software.
+instance Serialize (PeerStore a) where
+  get = undefined
+  put = undefined
+
+-- | Used in 'get_peers' DHT queries.
+lookup :: InfoHash -> PeerStore a -> [PeerAddr a]
+lookup ih (PeerStore m) = fromMaybe [] $ HM.lookup ih m
+
+-- | Used in 'announce_peer' DHT queries.
+insert :: Eq a => InfoHash -> PeerAddr a -> PeerStore a -> PeerStore a
+insert ih a (PeerStore m) = PeerStore (HM.insertWith L.union ih [a] m)
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index e770b1d3..7df25739 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -95,7 +95,8 @@ import Data.Torrent.InfoHash
 import Network.KRPC hiding (Options, def)
 import qualified Network.KRPC as KRPC (def)
 import Network.BitTorrent.Core
-import Network.BitTorrent.Core.PeerAddr as P
+import Network.BitTorrent.Core.PeerAddr
+import Network.BitTorrent.DHT.ContactInfo as P
 import Network.BitTorrent.DHT.Message
 import Network.BitTorrent.DHT.Routing as R
 import Network.BitTorrent.DHT.Token   as T