4 files changed, 15 insertions, 13 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 6dbc1120..52ff3c98 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -229,7 +229,8 @@ instance Kademlia Tox.Message where
     nameFindNodes _ = Tox.GetNodes
     initializeDHTData = return ToxData
 
-instance Pretty (NodeId 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
diff --git a/src/Network/DatagramServer/Mainline.hs b/src/Network/DatagramServer/Mainline.hs
index e9e2798c..c2333a42 100644
--- a/src/Network/DatagramServer/Mainline.hs
+++ b/src/Network/DatagramServer/Mainline.hs
@@ -233,11 +233,6 @@ instance BEncode (NodeId KMessageOf) where
 
 -- instance BEncode NodeId where TODO
 
--- TODO: put this somewhere appropriate
-instance (Serialize a, Serialize b) => Serialize (LargeKey a b) where
-   put (LargeKey lo hi) = put hi >> put lo
-   get = flip LargeKey <$> get <*> get
-
 instance Serialize (NodeId KMessageOf) where
   get = NodeId <$> get
   {-# INLINE get #-}
@@ -257,8 +252,7 @@ instance Default (NodeId KMessageOf) where
   def = NodeId 0
 
 -- | base16 encoded.
-instance Pretty (NodeId KMessageOf) where
-  pPrint (NodeId nid) = PP.text $ Char8.unpack $ Base16.encode $ S.encode nid
+instance Pretty (NodeId KMessageOf) where pPrint (NodeId nid) = encodeHexDoc nid
 
 
 instance Serialize (TransactionID KMessageOf) where
diff --git a/src/Network/DatagramServer/Tox.hs b/src/Network/DatagramServer/Tox.hs
index 300c8f4c..2c432d70 100644
--- a/src/Network/DatagramServer/Tox.hs
+++ b/src/Network/DatagramServer/Tox.hs
@@ -30,6 +30,7 @@ import Network.DatagramServer.Types
 import qualified Network.DatagramServer.Types as Envelope (NodeId)
 import Crypto.PubKey.ECC.Types
 
+
 type Key32   = Word256 -- 32 byte key
 type Nonce8  = Word64  -- 8 bytes
 type Nonce24 = Word192 -- 24 bytes
@@ -89,11 +90,6 @@ pattern SendNodes = MessageType 4
  -}
 
 
--- FIXME Orphan Serialize intance for large words
-instance (Serialize a, Serialize b) => Serialize (LargeKey a b) where
-   put (LargeKey lo hi) = put hi >> put lo
-   get = flip LargeKey <$> get <*> get
-
 -- | Use with 'PingPayload', 'GetNodesPayload', or 'SendNodesPayload'
 data Message a = Message
     { msgType    :: MessageType
diff --git a/src/Network/DatagramServer/Types.hs b/src/Network/DatagramServer/Types.hs
index afc357b0..dd915fdb 100644
--- a/src/Network/DatagramServer/Types.hs
+++ b/src/Network/DatagramServer/Types.hs
@@ -41,6 +41,8 @@ import qualified Data.ByteString as BS
 import Data.ByteString.Base16          as Base16
 import System.Entropy
 import Network.DatagramServer.Error
+import Data.LargeWord
+
 
 class (Eq a, Serialize a, Typeable a, Hashable a, Pretty a)
     => Address a where
@@ -330,3 +332,12 @@ class Envelope envelope => WireFormat raw envelope where
 
     encodeHeaders :: CipherContext raw envelope -> envelope raw -> ByteString
     encodePayload :: SerializableTo raw a => envelope a -> envelope raw
+
+encodeHexDoc :: Serialize x => x -> Doc
+encodeHexDoc nid = PP.text $ Char8.unpack $ Base16.encode $ S.encode nid
+
+-- FIXME Orphan Serialize intance for large words
+instance (Serialize a, Serialize b) => Serialize (LargeKey a b) where
+   put (LargeKey lo hi) = put hi >> put lo
+   get = flip LargeKey <$> get <*> get
+