Abstract facility to represent Tox encrypted nonces.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs
index e004eef3..0e0297a0 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -329,8 +329,8 @@ query :: forall h a b raw msg.
     , SerializableTo raw a
     , WireFormat raw msg
     , KRPC msg a b
-    ) => Manager raw msg -> QueryMethod msg -> SockAddr -> a -> IO b
-query mgr meth addr params = queryK mgr meth addr params (\_ x _ -> x)
+    ) => Manager raw msg -> SockAddr -> a -> IO b
+query mgr addr params = queryK mgr addr params (\_ x _ -> x)
 
 -- | Like 'query' but possibly returns your externally routable IP address.
 query' :: forall h a b raw msg.
@@ -340,8 +340,8 @@ query' :: forall h a b raw msg.
     , Serialize (TransactionID msg)
     , SerializableTo raw a , WireFormat raw msg
     , KRPC msg a b
-    ) => Manager raw msg -> QueryMethod msg -> SockAddr -> a -> IO (b , Maybe ReflectedIP)
-query' mgr meth addr params = queryK mgr meth addr params (const (,))
+    ) => Manager raw msg -> SockAddr -> a -> IO (b , Maybe ReflectedIP)
+query' mgr addr params = queryK mgr addr params (const (,))
 
 -- | Enqueue a query, but give us the complete BEncoded content sent by the
 -- remote Node.  This is useful for handling extensions that this library does
@@ -354,8 +354,8 @@ queryRaw :: forall h a b raw msg.
     , SerializableTo raw a
     , WireFormat raw msg
     , KRPC msg a b
-    ) => Manager raw msg -> QueryMethod msg -> SockAddr -> a -> IO (b , raw)
-queryRaw mgr meth addr params = queryK mgr meth addr params (\raw x _ -> (x,raw))
+    ) => Manager raw msg -> SockAddr -> a -> IO (b , raw)
+queryRaw mgr addr params = queryK mgr addr params (\raw x _ -> (x,raw))
 
 queryK :: forall h a b x raw msg.
     ( SerializableTo raw b
@@ -366,10 +366,10 @@ queryK :: forall h a b x raw msg.
     , Serialize (TransactionID msg)
     , KRPC msg a b
     ) =>
-    Manager raw msg -> QueryMethod msg -> SockAddr -> a -> (raw -> b -> Maybe ReflectedIP -> x) -> IO x
-queryK mgr@Manager{..} meth addr params kont = do
+    Manager raw msg -> SockAddr -> a -> (raw -> b -> Maybe ReflectedIP -> x) -> IO x
+queryK mgr@Manager{..} addr params kont = do
   tid <- liftIO $ genTransactionId transactionCounter
-  -- let queryMethod = method :: Method a b
+  let Method meth = method :: Method msg a b
   let signature = querySignature meth tid addr
   logMsg 'D' "query.sending" signature