1 files changed, 44 insertions, 44 deletions

diff --git a/src/Network/Tox/DHT/Transport.hs b/src/Network/Tox/DHT/Transport.hs
index 16af0e3f..5bd9caa1 100644
--- a/src/Network/Tox/DHT/Transport.hs
+++ b/src/Network/Tox/DHT/Transport.hs
@@ -50,30 +50,30 @@ type HandleHi a = Maybe (Either String (DHTMessage Encrypted8, NodeInfo)) -> IO
 
 
 data DHTMessage (f :: * -> *)
-    = DHTPing (Assym (f Ping))
-    | DHTPong (Assym (f Pong))
-    | DHTGetNodes (Assym (f GetNodes))
-    | DHTSendNodes (Assym (f SendNodes))
-    | DHTCookieRequest (Assym (f CookieRequest))
+    = DHTPing (Asymm (f Ping))
+    | DHTPong (Asymm (f Pong))
+    | DHTGetNodes (Asymm (f GetNodes))
+    | DHTSendNodes (Asymm (f SendNodes))
+    | DHTCookieRequest (Asymm (f CookieRequest))
     | DHTCookie Nonce24 (f Cookie)
-    | DHTDHTRequest PublicKey (Assym (f DHTRequest))
+    | DHTDHTRequest PublicKey (Asymm (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 (Asymm (f Ping))
+                  , Show (Asymm (f Pong))
+                  , Show (Asymm (f GetNodes))
+                  , Show (Asymm (f SendNodes))
+                  , Show (Asymm (f CookieRequest))
+                  , Show (Asymm (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)
-mapMessage f (DHTGetNodes      a) = f (assymNonce a) (assymData a)
-mapMessage f (DHTSendNodes     a) = f (assymNonce a) (assymData a)
-mapMessage f (DHTCookieRequest a) = f (assymNonce a) (assymData a)
-mapMessage f (DHTDHTRequest  _ a) = f (assymNonce a) (assymData a)
+mapMessage f (DHTPing          a) = f (asymmNonce a) (asymmData a)
+mapMessage f (DHTPong          a) = f (asymmNonce a) (asymmData a)
+mapMessage f (DHTGetNodes      a) = f (asymmNonce a) (asymmData a)
+mapMessage f (DHTSendNodes     a) = f (asymmNonce a) (asymmData a)
+mapMessage f (DHTCookieRequest a) = f (asymmNonce a) (asymmData a)
+mapMessage f (DHTDHTRequest  _ a) = f (asymmNonce a) (asymmData a)
 mapMessage f (DHTCookie nonce fcookie) = f nonce fcookie
 
 
@@ -99,13 +99,13 @@ encodeDHTAddr :: (DHTMessage Encrypted8,NodeInfo) -> (ByteString, SockAddr)
 encodeDHTAddr (msg,ni) = (runPut $ putMessage msg, nodeAddr ni)
 
 dhtMessageType :: DHTMessage Encrypted8 -> ( Word8, Put )
-dhtMessageType (DHTPing           a) = (0x00, putAssym a)
-dhtMessageType (DHTPong           a) = (0x01, putAssym a)
-dhtMessageType (DHTGetNodes       a) = (0x02, putAssym a)
-dhtMessageType (DHTSendNodes      a) = (0x04, putAssym a)
-dhtMessageType (DHTCookieRequest  a) = (0x18, putAssym a)
+dhtMessageType (DHTPing           a) = (0x00, putAsymm a)
+dhtMessageType (DHTPong           a) = (0x01, putAsymm a)
+dhtMessageType (DHTGetNodes       a) = (0x02, putAsymm a)
+dhtMessageType (DHTSendNodes      a) = (0x04, putAsymm a)
+dhtMessageType (DHTCookieRequest  a) = (0x18, putAsymm a)
 dhtMessageType (DHTCookie       n x) = (0x19, put n >> put x)
-dhtMessageType (DHTDHTRequest   k a) = (0x20, putPublicKey k >> putAssym a)
+dhtMessageType (DHTDHTRequest   k a) = (0x20, putPublicKey k >> putAsymm a)
 
 putMessage :: DHTMessage Encrypted8 -> Put
 putMessage msg = case dhtMessageType msg of (typ,p) -> put typ >> p
@@ -113,8 +113,8 @@ putMessage msg = case dhtMessageType msg of (typ,p) -> put typ >> p
 getCookie :: Get (Nonce24, Encrypted8 Cookie)
 getCookie = get
 
-getDHTReqest :: Get (PublicKey, Assym (Encrypted8 DHTRequest))
-getDHTReqest = (,) <$> getPublicKey <*> getAssym
+getDHTReqest :: Get (PublicKey, Asymm (Encrypted8 DHTRequest))
+getDHTReqest = (,) <$> getPublicKey <*> getAsymm
 
 -- ## DHT Request packets
 --
@@ -125,19 +125,19 @@ getDHTReqest = (,) <$> getPublicKey <*> getAssym
 --   ...      ...
 
 
-getDHT :: Sized a => Get (Assym (Encrypted8 a))
-getDHT = getAssym
+getDHT :: Sized a => Get (Asymm (Encrypted8 a))
+getDHT = getAsymm
 
 
 -- Throws an error if called with a non-internet socket.
 direct :: Sized a => ByteString
                   -> SockAddr
-                  -> (Assym (Encrypted8 a) -> DHTMessage Encrypted8)
+                  -> (Asymm (Encrypted8 a) -> DHTMessage Encrypted8)
                   -> Either String (DHTMessage Encrypted8, NodeInfo)
 direct bs saddr f = fanGet bs getDHT f (asymNodeInfo saddr)
 
 -- Throws an error if called with a non-internet socket.
-asymNodeInfo :: SockAddr -> Assym a -> NodeInfo
+asymNodeInfo :: SockAddr -> Asymm a -> NodeInfo
 asymNodeInfo saddr asym = either (error . mappend "asymNodeInfo: ") id $ nodeInfo (key2id $ senderKey asym) saddr
 
 
@@ -351,11 +351,11 @@ encrypt crypto msg ni = ( transcode (encryptMessage crypto (id2key $ nodeId ni))
 encryptMessage :: Serialize a =>
                   TransportCrypto ->
                   PublicKey ->
-                  Nonce24 -> Either (Nonce8,a) (Assym (Nonce8,a)) -> Encrypted8 a
-encryptMessage crypto destKey n (Right assym) = E8 $ ToxCrypto.encrypt secret plain
+                  Nonce24 -> Either (Nonce8,a) (Asymm (Nonce8,a)) -> Encrypted8 a
+encryptMessage crypto destKey n (Right asymm) = E8 $ ToxCrypto.encrypt secret plain
  where
     secret = computeSharedSecret (transportSecret crypto) destKey n
-    plain  = encodePlain $ swap $ assymData assym
+    plain  = encodePlain $ swap $ asymmData asymm
 encryptMessage crypto destKey n (Left plain) = _todo -- need cached public key.
 
 decrypt :: TransportCrypto -> DHTMessage Encrypted8 -> NodeInfo -> Either String (DHTMessage ((,) Nonce8), NodeInfo)
@@ -364,12 +364,12 @@ decrypt crypto msg ni = (, ni) <$> (sequenceMessage $ transcode (decryptMessage
 decryptMessage :: Serialize x =>
                   TransportCrypto
                   -> Nonce24
-                  -> Either (Encrypted8 x) (Assym (Encrypted8 x))
+                  -> Either (Encrypted8 x) (Asymm (Encrypted8 x))
                   -> (Either String ∘ ((,) Nonce8)) x
-decryptMessage crypto n (Right assymE) = plain8 $ ToxCrypto.decrypt secret e
+decryptMessage crypto n (Right asymmE) = plain8 $ ToxCrypto.decrypt secret e
  where
-    secret = computeSharedSecret (transportSecret crypto) (senderKey assymE) n
-    E8 e   = assymData assymE
+    secret = computeSharedSecret (transportSecret crypto) (senderKey asymmE) n
+    E8 e   = asymmData asymmE
     plain8 = Composed . fmap swap . (>>= decodePlain)
 decryptMessage crypto n (Left (E8 e)) = _todo -- need cached public key
 
@@ -382,11 +382,11 @@ sequenceMessage (DHTCookieRequest asym)     = fmap DHTCookieRequest $ sequenceA
 sequenceMessage (DHTCookie n dta)           = fmap (DHTCookie n)    $ uncomposed dta
 sequenceMessage (DHTDHTRequest pubkey asym) = fmap (DHTDHTRequest pubkey) $ sequenceA $ fmap uncomposed asym
 
-transcode :: forall f g. (forall a. Serialize a => Nonce24 -> Either (f a) (Assym (f a)) -> g a) -> DHTMessage f -> DHTMessage g
-transcode f (DHTPing asym)              = DHTPing              $ asym { assymData = f (assymNonce asym) (Right asym) }
-transcode f (DHTPong asym)              = DHTPong              $ asym { assymData = f (assymNonce asym) (Right asym) }
-transcode f (DHTGetNodes asym)          = DHTGetNodes          $ asym { assymData = f (assymNonce asym) (Right asym) }
-transcode f (DHTSendNodes asym)         = DHTSendNodes         $ asym { assymData = f (assymNonce asym) (Right asym) }
-transcode f (DHTCookieRequest asym)     = DHTCookieRequest     $ asym { assymData = f (assymNonce asym) (Right asym) }
+transcode :: forall f g. (forall a. Serialize a => Nonce24 -> Either (f a) (Asymm (f a)) -> g a) -> DHTMessage f -> DHTMessage g
+transcode f (DHTPing asym)              = DHTPing              $ asym { asymmData = f (asymmNonce asym) (Right asym) }
+transcode f (DHTPong asym)              = DHTPong              $ asym { asymmData = f (asymmNonce asym) (Right asym) }
+transcode f (DHTGetNodes asym)          = DHTGetNodes          $ asym { asymmData = f (asymmNonce asym) (Right asym) }
+transcode f (DHTSendNodes asym)         = DHTSendNodes         $ asym { asymmData = f (asymmNonce asym) (Right asym) }
+transcode f (DHTCookieRequest asym)     = DHTCookieRequest     $ asym { asymmData = f (asymmNonce asym) (Right asym) }
 transcode f (DHTCookie n dta)           = DHTCookie n          $ f n  $ Left dta
-transcode f (DHTDHTRequest pubkey asym) = DHTDHTRequest pubkey $ asym { assymData = f (assymNonce asym) (Right asym) }
+transcode f (DHTDHTRequest pubkey asym) = DHTDHTRequest pubkey $ asym { asymmData = f (asymmNonce asym) (Right asym) }