Implemented instance Pretty (NodeInfo ...).

3 files changed, 7 insertions, 8 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 52ff3c98..15369ede 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -231,8 +231,6 @@ instance Kademlia Tox.Message where
 
 instance Pretty (NodeId Tox.Message) where pPrint (Tox.NodeId nid) = encodeHexDoc nid
 
-instance Pretty (NodeInfo Tox.Message IPv4 ()) where
-instance Pretty (NodeInfo Tox.Message IPv4 Bool) where -- TODO
 instance Read (NodeId KMessageOf) where
     readsPrec d s = map (\(ih,s) -> (toNodeId (ih::InfoHash),s)) $ readsPrec d s
 instance Read (NodeId Tox.Message) where -- TODO
diff --git a/src/Network/DatagramServer/Mainline.hs b/src/Network/DatagramServer/Mainline.hs
index c2333a42..c127c07b 100644
--- a/src/Network/DatagramServer/Mainline.hs
+++ b/src/Network/DatagramServer/Mainline.hs
@@ -318,12 +318,6 @@ instance Serialize a => Serialize (NodeInfo KMessageOf a ()) where
   get = (\a b -> NodeInfo a b ()) <$> get <*> get
   put NodeInfo {..} = put nodeId >> put nodeAddr
 
-instance Pretty ip => Pretty (NodeInfo KMessageOf ip ()) where
-  pPrint NodeInfo {..} = pPrint nodeId <> "@(" <> pPrint nodeAddr <> ")"
-
-instance Pretty ip => Pretty [NodeInfo KMessageOf ip ()] where
-  pPrint = PP.vcat . PP.punctuate "," . map pPrint
-
 
 #ifdef VERSION_bencoding
 instance BEncode ErrorCode where
diff --git a/src/Network/DatagramServer/Types.hs b/src/Network/DatagramServer/Types.hs
index dd915fdb..ea38d46e 100644
--- a/src/Network/DatagramServer/Types.hs
+++ b/src/Network/DatagramServer/Types.hs
@@ -341,3 +341,10 @@ instance (Serialize a, Serialize b) => Serialize (LargeKey a b) where
    put (LargeKey lo hi) = put hi >> put lo
    get = flip LargeKey <$> get <*> get
 
+instance (Pretty ip, Pretty (NodeId dht)) => Pretty (NodeInfo dht ip u) where
+  pPrint NodeInfo {..} = pPrint nodeId <> "@(" <> pPrint nodeAddr <> ")"
+
+instance (Pretty ip, Pretty (NodeId dht)) => Pretty [NodeInfo dht ip u] where
+  pPrint = PP.vcat . PP.punctuate "," . map pPrint
+
+