1 files changed, 17 insertions, 26 deletions

diff --git a/src/Network/KRPC/Method.hs b/src/Network/KRPC/Method.hs
index d0eb136a..84c7fe4c 100644
--- a/src/Network/KRPC/Method.hs
+++ b/src/Network/KRPC/Method.hs
@@ -9,12 +9,14 @@
 --
 {-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DefaultSignatures          #-}
+{-# LANGUAGE FlexibleContexts           #-}
+{-# LANGUAGE FunctionalDependencies     #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses      #-}
 {-# LANGUAGE RankNTypes                 #-}
 {-# LANGUAGE ScopedTypeVariables        #-}
+{-# LANGUAGE StandaloneDeriving         #-}
 {-# LANGUAGE TypeFamilies               #-}
-{-# LANGUAGE FunctionalDependencies #-}
 module Network.KRPC.Method
        ( Method (..)
        , KRPC (..)
@@ -32,6 +34,7 @@ import Data.List as L
 import Data.String
 import Data.Typeable
 import Network.DatagramServer.Mainline
+import Network.DatagramServer.Types
 
 
 -- | Method datatype used to describe method name, parameters and
@@ -44,28 +47,24 @@ import Network.DatagramServer.Mainline
 --
 --     * result: Type of return value of the method.
 --
-newtype Method param result = Method { methodName :: MethodName }
-  deriving ( Eq, Ord
-#ifdef VERSION_bencoding
-           , IsString
-           , BEncode
-#endif
-           )
+newtype Method dht param result = Method { methodName :: QueryMethod dht }
+
+deriving instance Eq (QueryMethod dht) => Eq (Method dht param result)
+deriving instance Ord (QueryMethod dht) => Ord (Method dht param result)
+deriving instance IsString (QueryMethod dht) => IsString (Method dht param result)
+deriving instance BEncode (QueryMethod dht) => BEncode (Method dht param result)
 
 -- | Example:
 --
 --   @show (Method \"concat\" :: [Int] Int) == \"concat :: [Int] -> Int\"@
 --
-instance (Typeable a, Typeable b) => Show (Method a b) where
+instance (Show (QueryMethod dht), Typeable a, Typeable b) => Show (Method dht a b) where
   showsPrec _ = showsMethod
 
-showsMethod :: forall a b. ( Typeable a , Typeable b ) => Method a b -> ShowS
+showsMethod :: forall dht a b. ( Show (QueryMethod dht), Typeable a , Typeable b ) => Method dht a b -> ShowS
 showsMethod (Method name) =
-#ifdef VERSION_bencoding
-    showString (BC.unpack name) <>
-#else
+    -- showString (BC.unpack name) <>
     shows (show name) <>
-#endif
     showString " :: " <>
     shows paramsTy <>
     showString " -> " <>
@@ -88,24 +87,16 @@ showsMethod (Method name) =
 --     method = \"ping\"
 --   @
 --
-class ( Typeable req, Typeable resp
--- #ifdef VERSION_bencoding
-      -- , BEncode req, BEncode resp
--- #else
-      -- , Serialize req, Serialize resp
--- #endif
-      )
-    => KRPC req resp | req -> resp, resp -> req where
+class ( Typeable req, Typeable resp)
+    => KRPC dht req resp | req -> resp, resp -> req where
 
   -- | Method name. Default implementation uses lowercased @req@
   -- datatype name.
   --
-  method :: Method req resp
+  method :: Method dht req resp
 
-#ifdef VERSION_bencoding
   -- TODO add underscores
-  default method :: Typeable req => Method req resp
+  default method :: (IsString (QueryMethod dht), Typeable req) => Method dht req resp
   method = Method $ fromString $ L.map toLower $ show $ typeOf hole
     where
       hole = error "krpc.method: impossible" :: req
-#endif