removed jsonrpc.takes_request

diff --git a/p2pool/bitcoin/worker_interface.py b/p2pool/bitcoin/worker_interface.py
index da791b5..d9007ce 100644 (file)
--- a/p2pool/bitcoin/worker_interface.py
+++ b/p2pool/bitcoin/worker_interface.py
@@ -126,7 +126,6 @@ class WorkerInterface(jsonrpc.Server):
             defer.returnValue(self.response_callback(getwork.decode_data(data), request))
         
         defer.returnValue((yield self.getwork(request)))
-    rpc_getwork.takes_request = True
     
     @defer.inlineCallbacks
     def getwork(self, request, long_poll=False):

diff --git a/p2pool/util/jsonrpc.py b/p2pool/util/jsonrpc.py
index 6d63a0a..a70808f 100644 (file)
--- a/p2pool/util/jsonrpc.py
+++ b/p2pool/util/jsonrpc.py
@@ -117,11 +117,8 @@ class Server(deferred_resource.DeferredResource):
                 raise Error(-32601, u'Method not found')
             method_meth = getattr(self, method_name)
             
-            if hasattr(method_meth, 'takes_request'):
-                params = [request] + list(params)
-            
             try:
-                result = yield method_meth(*params)
+                result = yield method_meth(request, *params)
             except Error:
                 raise
             except Exception: