Merge branch 'master' into dev

Conflicts:
	src/Network/BitTorrent/Exchange/Message.hs

2 files changed, 9 insertions, 2 deletions

diff --git a/src/Network/BitTorrent/Core/Node.hs b/src/Network/BitTorrent/Core/Node.hs
index a1a87135..0cb95dd2 100644
--- a/src/Network/BitTorrent/Core/Node.hs
+++ b/src/Network/BitTorrent/Core/Node.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE RecordWildCards            #-}
 {-# LANGUAGE TemplateHaskell            #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE DeriveDataTypeable         #-}
 module Network.BitTorrent.Core.Node
        (  -- * Node ID
          NodeId
@@ -20,7 +21,9 @@ import Data.Aeson.TH
 import Data.Bits
 import Data.ByteString as BS
 import Data.BEncode as BE
+import Data.Default
 import Data.Ord
+import Data.Typeable
 import Data.Serialize as S
 import Data.Word
 import Network
@@ -37,11 +40,15 @@ import Network.BitTorrent.Core.PeerAddr ()
 -- | Normally, /this/ node id should we saved between invocations of
 -- the client software.
 newtype NodeId = NodeId ByteString
-  deriving (Show, Eq, Ord, BEncode, FromJSON, ToJSON)
+  deriving (Show, Eq, Ord, BEncode, FromJSON, ToJSON, Typeable)
 
 nodeIdSize :: Int
 nodeIdSize = 20
 
+-- | Meaningless node id, for testing purposes only.
+instance Default NodeId where
+  def = NodeId (BS.replicate nodeIdSize 0)
+
 instance Serialize NodeId where
   get = NodeId <$> getByteString nodeIdSize
   {-# INLINE get #-}
diff --git a/src/Network/BitTorrent/Core/PeerAddr.hs b/src/Network/BitTorrent/Core/PeerAddr.hs
index bc4a1078..86b88491 100644
--- a/src/Network/BitTorrent/Core/PeerAddr.hs
+++ b/src/Network/BitTorrent/Core/PeerAddr.hs
@@ -254,7 +254,7 @@ peerSockAddr PeerAddr {..} =
 
 -- | Storage used to keep track a set of known peers in client,
 -- tracker or DHT sessions.
-newtype PeerStore a = PeerStore (HashMap InfoHash [PeerAddr a])
+newtype PeerStore ip = PeerStore (HashMap InfoHash [PeerAddr ip])
 
 -- | Empty store.
 instance Default (PeerStore a) where