1 files changed, 7 insertions, 27 deletions

diff --git a/src/Network/DatagramServer.hs b/src/Network/DatagramServer.hs
index e1bf91c5..5c77fb86 100644
--- a/src/Network/DatagramServer.hs
+++ b/src/Network/DatagramServer.hs
@@ -62,13 +62,9 @@
 {-# LANGUAGE TemplateHaskell        #-}
 {-# LANGUAGE KindSignatures #-}
 module Network.DatagramServer
-       ( -- * Methods
-         Method
-       , KRPC (..)
-
-         -- * RPC
+       (
          -- ** Query
-       , QueryFailure (..)
+         QueryFailure (..)
        , query
        , query'
        , queryRaw
@@ -97,7 +93,6 @@ module Network.DatagramServer
        ) where
 
 import Data.Default.Class
-import Network.DatagramServer.Mainline
 import Network.Socket (SockAddr (..))
 
 import Control.Applicative
@@ -115,11 +110,8 @@ import Control.Monad.Logger
 import Control.Monad.Reader
 import Control.Monad.Trans.Control
 #ifdef VERSION_bencoding
-import Data.BEncode as BE
-import Data.BEncode.Internal as BE
-import Data.BEncode.Pretty (showBEncode)
 #else
-import qualified Network.DatagramServer.Tox as Tox
+-- import qualified Network.DatagramServer.Tox as Tox
 #endif
 import qualified Data.ByteString.Base16 as Base16
 import Data.ByteString as BS
@@ -136,16 +128,10 @@ import Data.Text.Encoding as T
 import Data.Tuple
 import Data.Typeable
 import Network.DatagramServer.Types
-import Network.DatagramServer.Mainline
-import Network.KRPC.Method hiding (Envelope)
-import qualified Network.KRPC.Method as KRPC (Envelope)
 import Network.Socket hiding (listen)
 import Network.Socket.ByteString as BS
 import System.IO.Error
 import System.Timeout
-#ifdef VERSION_bencoding
-import Network.DHT.Mainline
-#endif
 
 
 {-----------------------------------------------------------------------
@@ -356,20 +342,20 @@ 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 m a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg, KRPC a b) => QueryMethod msg -> SockAddr -> a -> m b
+query :: forall h m a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg) => QueryMethod msg -> SockAddr -> a -> m b
 query meth addr params = queryK meth addr params (\_ x _ -> x)
 
 -- | Like 'query' but possibly returns your externally routable IP address.
-query' :: forall h m a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg, KRPC a b) => QueryMethod msg -> SockAddr -> a -> m (b, Maybe ReflectedIP)
+query' :: forall h m a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg) => QueryMethod msg -> SockAddr -> a -> m (b, Maybe ReflectedIP)
 query' meth addr params = queryK 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 m a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg, KRPC a b) => QueryMethod msg -> SockAddr -> a -> m (b, raw)
+queryRaw :: forall h m a b raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg) => QueryMethod msg -> SockAddr -> a -> m (b, raw)
 queryRaw meth addr params = queryK meth addr params (\raw x _ -> (x,raw))
 
-queryK :: forall h m a b x raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg, KRPC a b) =>
+queryK :: forall h m a b x raw msg. (SerializableTo raw b, Show (QueryMethod msg), Ord (TransactionID msg), Serialize (TransactionID msg), SerializableTo raw a, MonadKRPC h m raw msg, WireFormat raw msg) =>
     QueryMethod msg -> SockAddr -> a -> (raw -> b -> Maybe ReflectedIP -> x) -> m x
 queryK meth addr params kont = do
   Manager {..} <- getManager
@@ -537,7 +523,6 @@ handleQuery meth raw q addr = void $ fork $ do
   myThreadId >>= liftIO . flip labelThread "KRPC.handleQuery"
   Manager {..} <- getManager
   res <- dispatchHandler meth q addr
-#ifdef VERSION_bencoding
   let  res' = either buildError Just res
        ctx = error "TODO TOX ToxCipherContext 2 or () for Mainline"
        resbs = fmap (encodeHeaders ctx) res' :: Maybe BS.ByteString
@@ -549,11 +534,6 @@ handleQuery meth raw q addr = void $ fork $ do
 --   , either (const "<unicode-fail>") id $ T.decodeUtf8' (BL.toStrict $ showBEncode resbe)
 --   ]
   maybe (return ()) (sendMessage sock addr) resbs
-#else
-  -- Errors not sent for Tox.
-  let ctx = error "TODO TOX ToxCipherContext 2"
-  either (const $ return ()) (sendMessage sock addr . encodeHeaders ctx) res
-#endif
 
 handleResponse :: ( MonadKRPC h m raw msg
                   , Ord (TransactionID msg)