Add default instance for PeerInfo

3 files changed, 10 insertions, 6 deletions

diff --git a/src/Network/BitTorrent/Core/PeerId.hs b/src/Network/BitTorrent/Core/PeerId.hs
index cab30331..c860d9d4 100644
--- a/src/Network/BitTorrent/Core/PeerId.hs
+++ b/src/Network/BitTorrent/Core/PeerId.hs
@@ -73,6 +73,10 @@ newtype PeerId = PeerId { getPeerId :: ByteString }
 peerIdLen :: Int
 peerIdLen = 20
 
+-- | For testing purposes only.
+instance Default PeerId where
+  def = azureusStyle defaultClientId defaultVersionNumber ""
+
 instance Hashable PeerId where
   hashWithSalt = hashUsing getPeerId
   {-# INLINE hashWithSalt #-}
diff --git a/src/Network/BitTorrent/Tracker/RPC.hs b/src/Network/BitTorrent/Tracker/RPC.hs
index 0ffb2017..022751b4 100644
--- a/src/Network/BitTorrent/Tracker/RPC.hs
+++ b/src/Network/BitTorrent/Tracker/RPC.hs
@@ -47,10 +47,13 @@ import qualified Network.BitTorrent.Tracker.RPC.UDP  as UDP
 -- | Info to advertise to trackers.
 data PeerInfo = PeerInfo
   { peerId   :: !PeerId
-  , peerPort :: !PortNumber
   , peerIP   :: !(Maybe HostAddress)
+  , peerPort :: !PortNumber
   } deriving (Show, Eq)
 
+instance Default PeerInfo where
+  def = PeerInfo def Nothing 6881
+
 -- | Simplified announce query.
 data SAnnounceQuery = SAnnounceQuery
   { sInfoHash :: InfoHash
diff --git a/tests/Network/BitTorrent/Tracker/RPCSpec.hs b/tests/Network/BitTorrent/Tracker/RPCSpec.hs
index da4a0878..c3c7f9e2 100644
--- a/tests/Network/BitTorrent/Tracker/RPCSpec.hs
+++ b/tests/Network/BitTorrent/Tracker/RPCSpec.hs
@@ -15,9 +15,6 @@ import Network.BitTorrent.Tracker.RPC as RPC
 uris :: [URI]
 uris = UDP.trackerURIs ++ HTTP.trackerURIs
 
-pinfo :: PeerInfo
-pinfo = PeerInfo "-HS0003-203534.37422" 6000 Nothing
-
 instance Arbitrary SAnnounceQuery where
   arbitrary = SAnnounceQuery <$> arbitrary <*> arbitrary
                              <*> arbitrary <*> arbitrary
@@ -28,13 +25,13 @@ spec = do
     context (show uri) $ do
       describe "announce" $ do
         it "have valid response" $ do
-          withManager def pinfo $ \ mgr -> do
+          withManager def def $ \ mgr -> do
             q    <- arbitrarySample
             _    <- announce mgr uri q
             return ()
 
       describe "scrape" $ do
         it "have valid response" $ do
-          withManager def pinfo $ \ mgr -> do
+          withManager def def $ \ mgr -> do
             xs <- scrape mgr uri [def]
             L.length xs `shouldSatisfy` (>= 1)