2 files changed, 11 insertions, 13 deletions

diff --git a/src/Network/BitTorrent/Core/PeerAddr.hs b/src/Network/BitTorrent/Core/PeerAddr.hs
index 5570bfc1..b145c0d9 100644
--- a/src/Network/BitTorrent/Core/PeerAddr.hs
+++ b/src/Network/BitTorrent/Core/PeerAddr.hs
@@ -19,7 +19,6 @@ module Network.BitTorrent.Core.PeerAddr
        , defaultPorts
        , peerSockAddr
        , connectToPeer
-       , ppPeer
        ) where
 
 import Control.Applicative
@@ -34,6 +33,7 @@ import Data.Typeable
 import Data.Word
 import Network.Socket
 import Text.PrettyPrint
+import Text.PrettyPrint.Class
 
 import Data.Torrent.Client
 import Network.BitTorrent.Core.PeerId
@@ -89,6 +89,13 @@ instance Serialize PeerAddr where
   get = PeerAddr Nothing <$> get <*> get
   {-# INLINE get #-}
 
+instance Pretty PeerAddr where
+  pretty p @ PeerAddr {..}
+    | Just pid <- peerID = pretty (clientInfo pid) <+> "at" <+> paddr
+    |     otherwise      = paddr
+    where
+      paddr = text (show (peerSockAddr p))
+
 -- | Ports typically reserved for bittorrent P2P listener.
 defaultPorts :: [PortNumber]
 defaultPorts =  [6881..6889]
@@ -117,11 +124,3 @@ connectToPeer p = do
   sock <- socket AF_INET Stream Network.Socket.defaultProtocol
   connect sock (peerSockAddr p)
   return sock
-
--- | Pretty print peer address in human readable form.
-ppPeer :: PeerAddr -> Doc
-ppPeer p @ PeerAddr {..}
-  | Just pid <- peerID = ppClientInfo (clientInfo pid) <+> "at" <+> paddr
-  |     otherwise      = paddr
-  where
-    paddr = text (show (peerSockAddr p))
diff --git a/src/Network/BitTorrent/Core/PeerId.hs b/src/Network/BitTorrent/Core/PeerId.hs
index a212df3d..6aebe8d4 100644
--- a/src/Network/BitTorrent/Core/PeerId.hs
+++ b/src/Network/BitTorrent/Core/PeerId.hs
@@ -16,7 +16,6 @@
 module Network.BitTorrent.Core.PeerId
        ( -- * PeerId
          PeerId (getPeerId)
-       , ppPeerId
 
          -- * Generation
        , genPeerId
@@ -57,6 +56,7 @@ import Data.Version     (Version(Version), versionBranch)
 import System.Entropy   (getEntropy)
 import System.Locale    (defaultTimeLocale)
 import Text.PrettyPrint hiding ((<>))
+import Text.PrettyPrint.Class
 import Text.Read        (readMaybe)
 import Paths_bittorrent (version)
 
@@ -83,9 +83,8 @@ instance IsString PeerId where
     where
       bs = fromString str
 
--- | Format peer id in human readable form.
-ppPeerId :: PeerId -> Doc
-ppPeerId = text . BC.unpack . getPeerId
+instance Pretty PeerId where
+  pretty = text . BC.unpack . getPeerId
 
 {-----------------------------------------------------------------------
 --  Encoding