Cleanup

Author: grayjay

README.md

@@ -1,5 +1,5 @@
 json-rpc-server
 ===============
-[![Build Status](https://travis-ci.org/grayjay/json-rpc-server.svg?branch=master)](https://travis-ci.org/grayjay/json-rpc-server)
+[![Hackage](https://img.shields.io/hackage/v/json-rpc-server.svg?style=flat)](https://hackage.haskell.org/package/json-rpc-server) [![Build Status](https://travis-ci.org/grayjay/json-rpc-server.svg?branch=master)](https://travis-ci.org/grayjay/json-rpc-server)
 
-An implementation of the server side of JSON-RPC 2.0. See <http://www.jsonrpc.org/specification>. This library uses ByteString for input and output, leaving the choice of transport up to the user. The documentation is on Hackage: <http://hackage.haskell.org/package/json-rpc-server>.
+An implementation of the server side of JSON-RPC 2.0. See <http://www.jsonrpc.org/specification>.  json-rpc-server uses ByteString for input and output, leaving the choice of transport up to the user.  It can be used with [json-rpc-client](http://hackage.haskell.org/package/json-rpc-client) to create a client and server that communicate with the same methods.

json-rpc-server.cabal

@@ -18,6 +18,10 @@ description:         An implementation of the server side of JSON-RPC 2.0.
                      library uses 'ByteString' for input and output,
                      leaving the choice of transport up to the user.
                      See the "Network.JsonRpc.Server" module for an example.
+                     json-rpc-server can be used with
+                     <http://hackage.haskell.org/package/json-rpc-client json-rpc-client>
+                     to create a client and server that communicate
+                     with the same methods.
 
 source-repository head
   type:              git

src/Network/JsonRpc/Types.hs

@@ -138,7 +138,7 @@ instance A.FromJSON Request where
 data Response = Response Id (Either RpcError A.Value)
 
 instance NFData Response where
-    rnf (Response i e) = rnf i `seq` rnf e `seq` ()
+    rnf (Response i e) = rnf i `seq` rnf e
 
 instance A.ToJSON Response where
     toJSON (Response i result) = A.object pairs
@@ -151,8 +151,8 @@ instance A.ToJSON Response where
 data Id = IdString A.Value | IdNumber A.Value | IdNull
 
 instance NFData Id where
-    rnf (IdString s) = rnf s `seq` ()
-    rnf (IdNumber n) = rnf n `seq` ()
+    rnf (IdString s) = rnf s
+    rnf (IdNumber n) = rnf n
     rnf IdNull = ()
 
 instance A.FromJSON Id where
@@ -173,7 +173,7 @@ data RpcError = RpcError { errCode :: Int
                 deriving (Show, Eq)
 
 instance NFData RpcError where
-    rnf (RpcError e m d) = rnf e `seq` rnf m `seq` rnf d `seq` ()
+    rnf (RpcError e m d) = rnf e `seq` rnf m `seq` rnf d
 
 instance Error RpcError where
     noMsg = strMsg "unknown error"

tests/TestParallelism.hs

@@ -41,7 +41,7 @@ testParallelizingTasks = do
 
 possibleResponses :: [[A.Value]]
 possibleResponses = (rsp <$>) <$> perms
-    where perms = zip `zipWith` repeat [1, 2, 3] $ permutations ["A", "B", "C"] 
+    where perms = map (zip [1, 2, 3]) $ permutations ["A", "B", "C"]
           rsp (i, r) = defaultRsp `result` A.String r `id'` Just (A.Number i)
 
 lockRequest :: Int -> A.Value