From ed25a297094b483dce06e14d52ced2f93f6dca41 Mon Sep 17 00:00:00 2001
From: Sam Truzjan <pxqr.sta@gmail.com>
Date: Sat, 23 Nov 2013 03:37:15 +0400
Subject: Use pretty-class package

---
 src/Network/BitTorrent/Core/PeerAddr.hs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/Network/BitTorrent/Core/PeerAddr.hs')

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))
-- 
cgit v1.2.3