1 files changed, 8 insertions, 2 deletions

diff --git a/OnionTransport.hs b/OnionTransport.hs
index ce1063d2..968e3e38 100644
--- a/OnionTransport.hs
+++ b/OnionTransport.hs
@@ -77,6 +77,11 @@ data OnionMessage (f :: * -> *)
     | OnionToRoute PublicKey (Assym (f DataToRoute)) -- destination key, aliased Assym
     | OnionToRouteResponse (Assym (f DataToRoute))
 
+deriving instance ( Show (f (AnnounceRequest, Nonce8))
+                  , Show (f AnnounceResponse)
+                  , Show (f DataToRoute)
+                  ) => Show (OnionMessage f)
+
 data OnionToOwner = OnionToOwner NodeInfo (ReturnPath N3)
                   | OnionToMe SockAddr -- SockAddr is immediate peer in route
     deriving Show
@@ -228,11 +233,12 @@ instance ( Serialize (ReturnPath n) ) => Serialize (OnionResponse n) where
 
 
 data Addressed a = Addressed { sockAddr :: SockAddr, unaddressed :: a }
+ deriving (Eq,Show)
 
 instance Sized a => Sized (Addressed a) where
-    size = case size of
+    size = case size :: Size a of
             ConstSize n -> ConstSize     $ 1{-family-} + 16{-ip-} + 2{-port-} + n
-            VarSize f   -> VarSize $ \x -> 1{-family-} + 16{-ip-} + 2{-port-} + f x
+            VarSize f   -> VarSize $ \x -> 1{-family-} + 16{-ip-} + 2{-port-} + f (unaddressed x)
 
 getForwardAddr :: S.Get SockAddr
 getForwardAddr = do