2 files changed, 8 insertions, 1 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