2 files changed, 21 insertions, 2 deletions

diff --git a/DHTTransport.hs b/DHTTransport.hs
index ac263cdc..49d3034d 100644
--- a/DHTTransport.hs
+++ b/DHTTransport.hs
@@ -2,8 +2,10 @@
 {-# LANGUAGE KindSignatures             #-}
 {-# LANGUAGE LambdaCase                 #-}
 {-# LANGUAGE RankNTypes                 #-}
+{-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TupleSections              #-}
-{-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE TypeOperators              #-}
+{-# LANGUAGE UndecidableInstances #-}
 module DHTTransport
     ( parseDHTAddr
     , encodeDHTAddr
@@ -52,6 +54,15 @@ data DHTMessage (f :: * -> *)
     | DHTCookie Nonce24 (f Cookie)
     | DHTDHTRequest PublicKey (Assym (f DHTRequest))
 
+deriving instance ( Show (f Cookie)
+                  , Show (Assym (f Ping))
+                  , Show (Assym (f Pong))
+                  , Show (Assym (f GetNodes))
+                  , Show (Assym (f SendNodes))
+                  , Show (Assym (f CookieRequest))
+                  , Show (Assym (f DHTRequest))
+                  ) => Show (DHTMessage f)
+
 mapMessage :: forall f b. (forall a. Nonce24 -> f a -> b) -> DHTMessage f -> b
 mapMessage f (DHTPing          a) = f (assymNonce a) (assymData a)
 mapMessage f (DHTPong          a) = f (assymNonce a) (assymData a)
@@ -152,6 +163,7 @@ data DHTRequest
 --   `8`      `uint64_t` random number (the same that was received in request)
     | NATPong Nonce8
     | DHTPK LongTermKeyWrap
+ deriving Show
 
 instance Sized DHTRequest where
     size = VarSize $ \case
@@ -204,6 +216,7 @@ data LongTermKeyWrap = LongTermKeyWrap
     , wrapNonce       :: Nonce24
     , wrapData        :: Encrypted DHTPublicKey
     }
+ deriving Show
 
 instance Serialize LongTermKeyWrap where
     get = LongTermKeyWrap <$> getPublicKey <*> get <*> get
@@ -268,9 +281,12 @@ instance S.Serialize Pong where
     put Pong = S.put (1 :: Word8)
 
 newtype CookieRequest = CookieRequest PublicKey
+ deriving (Eq, Show)
 newtype CookieResponse = CookieResponse Cookie
+ deriving (Eq, Show)
 
 data Cookie = Cookie Nonce24 (Encrypted CookieData)
+ deriving (Eq, Ord, Show)
 
 instance Sized Cookie where size = ConstSize 112 -- 24 byte nonce + 88 byte cookie data
 
diff --git a/ToxCrypto.hs b/ToxCrypto.hs
index 5e602fc9..4a466357 100644
--- a/ToxCrypto.hs
+++ b/ToxCrypto.hs
@@ -92,6 +92,9 @@ instance Serialize Auth where
     get = Auth . Poly1305.Auth . BA.convert <$> getBytes 16
     put (Auth (Poly1305.Auth bs)) = putByteString $ BA.convert bs
 
+instance Typeable a => Show (Encrypted a) where
+    show (Encrypted _) = "Encrypted "++show (typeOf (undefined :: a))
+
 encryptedAuth :: Encrypted a -> Auth
 encryptedAuth (Encrypted bs)
     | Right auth <- decode (B.take 16 bs) = auth
@@ -279,7 +282,7 @@ data Assym a = Assym
     , assymNonce :: Nonce24
     , assymData :: a
     }
- deriving (Functor,Foldable,Traversable)
+ deriving (Functor,Foldable,Traversable, Show)
 
 instance Sized a => Sized (Assym a) where
     size = case size of