~ Move Method to KRPC.

2 files changed, 42 insertions, 57 deletions

diff --git a/src/Remote/KRPC.hs b/src/Remote/KRPC.hs
index 5c1aadd6..ec83b802 100644
--- a/src/Remote/KRPC.hs
+++ b/src/Remote/KRPC.hs
@@ -5,14 +5,20 @@
 --   Stability   :  experimental
 --   Portability :  portable
 --
---   This module provides remote procedure call.
+--   This module provides safe remote procedure call.
 --
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleContexts, DeriveDataTypeable #-}
 {-# LANGUAGE ExplicitForAll, KindSignatures #-}
 {-# LANGUAGE ViewPatterns #-}
 module Remote.KRPC
-       ( module Remote.KRPC.Method, RemoteAddr
+       ( -- * Common
+         -- ** Types
+         RemoteAddr
+
+         -- ** Method
+       , Method(methodName, methodParams, methodVals)
+       , method, idM
 
          -- * Client
        , call, async, await
@@ -33,7 +39,40 @@ import Data.Typeable
 import Network
 
 import Remote.KRPC.Protocol
-import Remote.KRPC.Method
+
+
+-- | The
+--
+--   * argument: type of method parameter
+--
+--   * remote: A monad used by server-side.
+--
+--   * result: type of return value of the method.
+--
+data Method param result = Method {
+    -- | Name used in query and
+    methodName   :: MethodName
+
+    -- | Description of each parameter in /right to left/ order.
+  , methodParams :: [ParamName]
+
+    -- | Description of each return value in /right to left/ order.
+  , methodVals   :: [ValName]
+  }
+
+-- TODO ppMethod
+
+-- | Remote identity function. Could be used for echo servers for example.
+--
+--   idM = method "id" ["x"] ["y"] return
+--
+idM :: Method a a
+idM = method "id" ["x"] ["y"]
+{-# INLINE idM #-}
+
+method :: MethodName -> [ParamName] -> [ValName] -> Method param result
+method = Method
+{-# INLINE method #-}
 
 
 data RPCException = RPCException KError
diff --git a/src/Remote/KRPC/Method.hs b/src/Remote/KRPC/Method.hs
deleted file mode 100644
index 4d91fe47..00000000
--- a/src/Remote/KRPC/Method.hs
+++ /dev/null
@@ -1,54 +0,0 @@
--- |
---   Copyright   :  (c) Sam T. 2013
---   License     :  MIT
---   Maintainer  :  pxqr.sta@gmail.com
---   Stability   :  experimental
---   Portability :  portable
---
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE FlexibleInstances, UndecidableInstances #-}
-module Remote.KRPC.Method
-       ( Method(methodName, methodParams, methodVals)
-
-         -- * Construction
-       , method
-
-         -- * Predefined methods
-       , idM
-       ) where
-
-import Remote.KRPC.Protocol
-
-
--- | The
---
---   * argument: type of method parameter
---
---   * remote: A monad used by server-side.
---
---   * result: type of return value of the method.
---
-data Method param result = Method {
-    -- | Name used in query and
-    methodName   :: MethodName
-
-    -- | Description of each parameter in /right to left/ order.
-  , methodParams :: [ParamName]
-
-    -- | Description of each return value in /right to left/ order.
-  , methodVals   :: [ValName]
-  }
-
--- TODO ppMethod
-
--- | Remote identity function. Could be used for echo servers for example.
---
---   idM = method "id" ["x"] ["y"] return
---
-idM :: Method a a
-idM = method "id" ["x"] ["y"]
-{-# INLINE idM #-}
-
-method :: MethodName -> [ParamName] -> [ValName] -> Method param result
-method = Method
-{-# INLINE method #-}