2 files changed, 9 insertions, 11 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 555164f2..1c641584 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -170,12 +170,12 @@ instance Sized HandshakeData where
 
 instance Serialize HandshakeData where
     get = HandshakeData <$> get
-                        <*> (id2key <$> get)
+                        <*> getPublicKey
                         <*> (fromJust . digestFromByteString <$> getBytes 64)
                         <*> get
     put (HandshakeData n k h c) = do
         put n
-        put $ key2id k
+        putPublicKey k
         putByteString (convert h)
         put c
 
@@ -724,15 +724,15 @@ instance HasPeerNumber PeerInfo where
 instance Serialize PeerInfo where
     get = do
         w16 <- get
-        ukey <- id2key <$> get
-        dkey <- id2key <$> get
+        ukey <- getPublicKey
+        dkey <- getPublicKey
         w8 <- get :: Get Word8
         PeerInfo w16 ukey dkey <$> getBytes (fromIntegral w8)
 
     put (PeerInfo w16 ukey dkey bs) = do
         put w16
-        put $ key2id ukey
-        put $ key2id dkey
+        putPublicKey ukey
+        putPublicKey dkey
         let sz :: Word8
             sz = case B.length bs of
                     n | n <= 255  -> fromIntegral n
diff --git a/src/Network/Tox/DHT/Transport.hs b/src/Network/Tox/DHT/Transport.hs
index e784ec90..b9b63165 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/src/Network/Tox/DHT/Transport.hs
@@ -382,13 +382,11 @@ instance Sized CookieData where
     size = ConstSize 72
 
 instance Serialize CookieData where
-    get = CookieData <$> get
-                     <*> (id2key <$> get)
-                     <*> (id2key <$> get)
+    get = CookieData <$> get <*> getPublicKey <*> getPublicKey
     put (CookieData tm userkey dhtkey) = do
         put tm
-        put (key2id userkey)
-        put (key2id dhtkey)
+        putPublicKey userkey
+        putPublicKey userkey
 
 instance Sized CookieRequest where
     size = ConstSize 64 -- 32 byte key + 32 byte padding