1 files changed, 24 insertions, 3 deletions

diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs
index 91efa443..d478d667 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -324,16 +324,36 @@ query :: forall h a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Or
 query mgr meth addr params = queryK mgr meth addr params (\_ x _ -> x)
 
 -- | Like 'query' but possibly returns your externally routable IP address.
-query' :: forall h a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, WireFormat raw msg) => Manager raw msg -> QueryMethod msg -> SockAddr -> a -> IO (b, Maybe ReflectedIP)
+query' :: forall h a b raw msg.
+    ( SerializableTo raw b
+    , Show (QueryMethod msg)
+    , Ord (TransactionID msg)
+    , Serialize (TransactionID msg)
+    , SerializableTo raw a , WireFormat raw msg
+    ) => Manager raw msg -> QueryMethod msg -> SockAddr -> a -> IO (b , Maybe ReflectedIP)
 query' mgr meth addr params = queryK mgr meth 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
 -- not otherwise support.
-queryRaw :: forall h a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, WireFormat raw msg) => Manager raw msg -> QueryMethod msg -> SockAddr -> a -> IO (b, raw)
+queryRaw :: forall h a b raw msg.
+    ( SerializableTo raw b
+    , Show (QueryMethod msg)
+    , Ord (TransactionID msg)
+    , Serialize (TransactionID msg)
+    , SerializableTo raw a
+    , WireFormat raw msg
+    ) => Manager raw msg -> QueryMethod msg -> SockAddr -> a -> IO (b , raw)
 queryRaw mgr meth addr params = queryK mgr meth addr params (\raw x _ -> (x,raw))
 
-queryK :: forall h a b x raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, WireFormat raw msg) =>
+queryK :: forall h a b x raw msg.
+    ( SerializableTo raw b
+    , SerializableTo raw a
+    , WireFormat raw msg
+    , Show (QueryMethod msg)
+    , Ord (TransactionID msg)
+    , Serialize (TransactionID msg)
+    ) =>
     Manager raw msg -> QueryMethod msg -> SockAddr -> a -> (raw -> b -> Maybe ReflectedIP -> x) -> IO x
 queryK mgr@Manager{..} meth addr params kont = do
   tid <- liftIO $ genTransactionId transactionCounter
@@ -353,6 +373,7 @@ queryK mgr@Manager{..} meth addr params kont = do
       `onException` unregisterQuery (tid, addr) pendingCalls
 
     timeout (optQueryTimeout options * 10 ^ (6 :: Int)) $ do
+      -- TODO: Loop with polymorphic sanity-check (to handle Tox's nonces).
       (raw,res) <- readMVar ares -- MVar (KQueryArgs, KResult)
       case res of
         Left  (KError   c m _) -> throwIO $ QueryFailed c (T.decodeUtf8 m)