1 files changed, 16 insertions, 16 deletions

diff --git a/src/Network/Tox/DHT/Handlers.hs b/src/Network/Tox/DHT/Handlers.hs
index a3f13ac7..4f891316 100644
--- a/src/Network/Tox/DHT/Handlers.hs
+++ b/src/Network/Tox/DHT/Handlers.hs
@@ -188,29 +188,29 @@ type Message = DHTMessage ((,) Nonce8)
 type Client = QR.Client String PacketKind TransactionId NodeInfo Message
 
 
-wrapAssym :: TransactionId -> NodeInfo -> NodeInfo -> (Nonce8 -> dta) -> Assym dta
-wrapAssym (TransactionId n8 n24) src dst dta = Assym
+wrapAsymm :: TransactionId -> NodeInfo -> NodeInfo -> (Nonce8 -> dta) -> Asymm dta
+wrapAsymm (TransactionId n8 n24) src dst dta = Asymm
     { senderKey = id2key $ nodeId src
-    , assymNonce = n24
-    , assymData = dta n8
+    , asymmNonce = n24
+    , asymmData = dta n8
     }
 
 serializer :: PacketKind
-                -> (Assym (Nonce8,ping) -> Message)
-                -> (Message -> Maybe (Assym (Nonce8,pong)))
+                -> (Asymm (Nonce8,ping) -> Message)
+                -> (Message -> Maybe (Asymm (Nonce8,pong)))
                 -> MethodSerializer TransactionId NodeInfo Message PacketKind ping (Maybe pong)
 serializer pktkind mkping mkpong = MethodSerializer
         { methodTimeout  = \tid addr -> return (addr, 5000000)
         , method         = pktkind
         -- wrapQuery :: tid -> addr -> addr -> qry -> x
-        , wrapQuery      = \tid src dst ping -> mkping $ wrapAssym tid src dst (, ping)
+        , wrapQuery      = \tid src dst ping -> mkping $ wrapAsymm tid src dst (, ping)
         -- unwrapResponse :: x -> b
-        , unwrapResponse = fmap (snd . assymData) . mkpong
+        , unwrapResponse = fmap (snd . asymmData) . mkpong
         }
 
 
-unpong :: Message -> Maybe (Assym (Nonce8,Pong))
-unpong (DHTPong assym) = Just assym
+unpong :: Message -> Maybe (Asymm (Nonce8,Pong))
+unpong (DHTPong asymm) = Just asymm
 unpong _               = Nothing
 
 showHex :: BA.ByteArrayAccess ba => ba -> String
@@ -223,8 +223,8 @@ ping client addr = do
     hPutStrLn stderr $ show addr ++ " -pong-> " ++ show reply
     maybe (return False) (\Pong -> return True) $ join reply
 
-unsendNodes :: Message -> Maybe (Assym (Nonce8,SendNodes))
-unsendNodes (DHTSendNodes assym) = Just assym
+unsendNodes :: Message -> Maybe (Asymm (Nonce8,SendNodes))
+unsendNodes (DHTSendNodes asymm) = Just asymm
 unsendNodes _                    = Nothing
 
 unwrapNodes :: SendNodes -> ( [NodeInfo], [NodeInfo], () )
@@ -285,18 +285,18 @@ transitionCommittee committee _ = return $ return ()
 type Handler = MethodHandler String TransactionId NodeInfo Message
 
 isPing :: (f Ping -> Ping) ->  DHTMessage f -> Either String Ping
-isPing unpack (DHTPing a) = Right $ unpack $ assymData a
+isPing unpack (DHTPing a) = Right $ unpack $ asymmData a
 isPing _      _           = Left "Bad ping"
 
 mkPong :: TransactionId -> NodeInfo -> NodeInfo -> Pong -> DHTMessage ((,) Nonce8)
-mkPong tid src dst pong = DHTPong $ wrapAssym tid src dst (, pong)
+mkPong tid src dst pong = DHTPong $ wrapAsymm tid src dst (, pong)
 
 isGetNodes :: (f GetNodes -> GetNodes) ->  DHTMessage f -> Either String GetNodes
-isGetNodes unpack (DHTGetNodes a) = Right $ unpack $ assymData a
+isGetNodes unpack (DHTGetNodes a) = Right $ unpack $ asymmData a
 isGetNodes _      _               = Left "Bad GetNodes"
 
 mkSendNodes :: TransactionId -> NodeInfo -> NodeInfo -> SendNodes -> DHTMessage ((,) Nonce8)
-mkSendNodes tid src dst sendnodes = DHTSendNodes $ wrapAssym tid src dst (, sendnodes)
+mkSendNodes tid src dst sendnodes = DHTSendNodes $ wrapAsymm tid src dst (, sendnodes)
 
 handlers :: Routing -> PacketKind -> Maybe Handler
 handlers routing PingType     = Just $ MethodHandler (isPing snd) mkPong pingH