1 files changed, 18 insertions, 18 deletions

diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs
index 2140e2cd..91efa443 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -190,13 +190,13 @@ type Handler     h msg v = (QueryMethod msg, HandlerBody h msg v)
 
 -- | Keep track pending queries made by /this/ node and handle queries
 -- made by /remote/ nodes.
-data Manager h raw msg = Manager
+data Manager raw msg = Manager
   { sock               :: !Socket
   , options            :: !Options
   , listenerThread     :: !(MVar ThreadId)
   , transactionCounter :: {-# UNPACK #-} !TransactionCounter
   , pendingCalls       :: {-# UNPACK #-} !(PendingCalls msg raw)
-  , handlers           :: [Handler h msg raw] -- TODO delete this, it's not used
+  -- , handlers           :: [Handler h msg raw] -- TODO delete this, it's not used
   , logMsg             :: Char -> String -> T.Text -> IO ()
   }
 
@@ -212,14 +212,14 @@ newManager :: Options                       -- ^ various protocol options;
            -> (Char -> String -> T.Text -> IO ()) -- ^ loging function
            -> SockAddr                      -- ^ address to listen on;
            -> [Handler h msg raw] -- ^ handlers to run on incoming queries.
-           -> IO (Manager h raw msg)                -- ^ new rpc manager.
+           -> IO (Manager raw msg)                -- ^ new rpc manager.
 newManager opts @ Options {..} logmsg servAddr handlers = do
     validateOptions opts
     sock  <- bindServ
     tref  <- newEmptyMVar
     tran  <- newIORef optSeedTransaction
     calls <- newIORef M.empty
-    return $ Manager sock opts tref tran calls handlers logmsg
+    return $ Manager sock opts tref tran calls logmsg
   where
     bindServ = do
       let family = sockAddrFamily servAddr
@@ -230,7 +230,7 @@ newManager opts @ Options {..} logmsg servAddr handlers = do
       return sock
 
 -- | Unblock all pending calls and close socket.
-closeManager :: Manager m raw msg -> IO ()
+closeManager :: Manager raw msg -> IO ()
 closeManager Manager {..} = do
   maybe (return ()) killThread =<< tryTakeMVar listenerThread
   -- TODO unblock calls
@@ -238,7 +238,7 @@ closeManager Manager {..} = do
 
 -- | Check if the manager is still active. Manager becomes active
 -- until 'closeManager' called.
-isActive :: Manager m raw msg -> IO Bool
+isActive :: Manager raw msg -> IO Bool
 isActive Manager {..} = liftIO $ isBound sock
 {-# INLINE isActive #-}
 
@@ -246,7 +246,7 @@ isActive Manager {..} = liftIO $ isBound sock
 -- | Normally you should use Control.Monad.Trans.Resource.allocate
 -- function.
 withManager :: Options -> SockAddr -> [Handler h msg raw]
-            -> (Manager h raw msg -> IO a) -> IO a
+            -> (Manager raw msg -> IO a) -> IO a
 withManager opts addr hs = bracket (newManager opts addr hs) closeManager
 #endif
 
@@ -289,7 +289,7 @@ genTransactionId ref = do
   uniqueTransactionId cur
 
 -- | How many times 'query' call have been performed.
-getQueryCount :: Manager h raw msg -> IO Int
+getQueryCount :: Manager raw msg -> IO Int
 getQueryCount mgr@Manager{..} = do
   curTrans <- readIORef transactionCounter
   return $ curTrans - optSeedTransaction options
@@ -320,21 +320,21 @@ sendQuery sock addr q = handle sockError $ sendMessage sock addr q
 --  This function should throw 'QueryFailure' exception if quered node
 --  respond with @error@ message or the query timeout expires.
 --
-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 h raw msg -> QueryMethod msg -> SockAddr -> a -> IO b
+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
 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 h 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 h 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) =>
-    Manager h raw msg -> QueryMethod msg -> SockAddr -> a -> (raw -> b -> Maybe ReflectedIP -> x) -> IO x
+    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
   -- let queryMethod = method :: Method a b
@@ -424,7 +424,7 @@ handler name body = (name, wrapper)
 runHandler :: ( Envelope msg
               , Show (QueryMethod msg)
               , Serialize (TransactionID msg))
-           => Manager IO raw msg -> QueryMethod msg -> HandlerBody IO msg raw -> SockAddr -> msg raw -> IO (KResult msg raw)
+           => Manager raw msg -> QueryMethod msg -> HandlerBody IO msg raw -> SockAddr -> msg raw -> IO (KResult msg raw)
 runHandler mgr@Manager{..} meth h addr m = Lifted.catches wrapper failbacks
   where
     signature = querySignature meth (envelopeTransaction m) addr
@@ -462,7 +462,7 @@ dispatchHandler :: ( Eq (QueryMethod msg)
                    , Show (QueryMethod msg)
                    , Serialize (TransactionID msg)
                    , Envelope msg
-                   ) => Manager IO raw msg -> [Handler IO msg raw] -> QueryMethod msg -> msg raw -> SockAddr -> IO (KResult msg raw)
+                   ) => Manager raw msg -> [Handler IO msg raw] -> QueryMethod msg -> msg raw -> SockAddr -> IO (KResult msg raw)
 dispatchHandler mgr handlers meth q addr = do
   case L.lookup meth handlers of
     Nothing -> return $ Left $ KError MethodUnknown ("Unknown method " <> BC.pack (show meth)) (envelopeTransaction q)
@@ -483,7 +483,7 @@ handleQuery :: ( WireFormat raw msg
                , Eq (QueryMethod msg)
                , Show (QueryMethod msg)
                , Serialize (TransactionID msg)
-               ) => Manager IO raw msg -> [Handler IO msg raw] -> QueryMethod msg -> raw -> msg raw -> SockAddr -> IO ()
+               ) => Manager raw msg -> [Handler IO msg raw] -> QueryMethod msg -> raw -> msg raw -> SockAddr -> IO ()
 handleQuery mgr@Manager{..} hs meth raw q addr = void $ fork $ do
   myThreadId >>= liftIO . flip labelThread "KRPC.handleQuery"
   res <- dispatchHandler mgr hs meth q addr
@@ -501,7 +501,7 @@ handleQuery mgr@Manager{..} hs meth raw q addr = void $ fork $ do
 
 handleResponse :: ( Ord (TransactionID msg)
                   , Envelope msg
-                  ) => Manager IO raw msg -> raw -> KResult msg raw -> SockAddr -> IO ()
+                  ) => Manager raw msg -> raw -> KResult msg raw -> SockAddr -> IO ()
 handleResponse mgr@Manager{..} raw result addr = do
   liftIO $ do
     let resultId = either errorId envelopeTransaction result
@@ -520,7 +520,7 @@ listener :: forall raw msg.
             , Eq (QueryMethod msg)
             , Show (QueryMethod msg)
             , Serialize (TransactionID msg)
-            ) => Manager IO raw msg -> [Handler IO msg raw] -> Protocol raw msg -> IO ()
+            ) => Manager raw msg -> [Handler IO msg raw] -> Protocol raw msg -> IO ()
 listener mgr@Manager{..} hs p = do
   fix $ \again -> do
     let ctx = error "TODO TOX ToxCipherContext or () for Mainline"
@@ -551,7 +551,7 @@ listen :: ( WireFormat raw msg
           , Eq (QueryMethod msg)
           , Show (QueryMethod msg)
           , Serialize (TransactionID msg)
-          ) => Manager IO raw msg -> [Handler IO msg raw] ->  Protocol raw msg -> IO ()
+          ) => Manager raw msg -> [Handler IO msg raw] ->  Protocol raw msg -> IO ()
 listen mgr@Manager{..} hs p = do
   tid <- fork $ do
     myThreadId >>= liftIO . flip labelThread "KRPC.listen"