From 281586653493ec440f8b078e3c42b212bd17c555 Mon Sep 17 00:00:00 2001 From: Dylan Wilson Date: Sun, 13 Jan 2019 15:55:25 +0800 Subject: [PATCH] Update manager request function for single provider --- web3/manager.py | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/web3/manager.py b/web3/manager.py index 4bb540890e..18c9e0b07b 100644 --- a/web3/manager.py +++ b/web3/manager.py @@ -80,37 +80,18 @@ def default_middlewares(web3): # Provider requests and response # def _make_request(self, method, params): - if self.provider: - request_func = self.provider.request_func(self.web3, tuple(self.middleware_stack)) - self.logger.debug("Making request. Method: %s", method) - return request_func(method, params) - else: - raise UnhandledRequest( - "No provider available to respond to the RPC request:\n" - "method:{0}\n" - "params:{1}\n".format( - method, - params, - ) - ) + request_func = self.provider.request_func( + self.web3, + tuple(self.middleware_stack)) + self.logger.debug("Making request. Method: %s", method) + return request_func(method, params) async def _coro_make_request(self, method, params): - for provider in self.providers: - request_func = provider.request_func(self.web3, tuple(self.middleware_stack)) - self.logger.debug("Making request. Method: %s", method) - try: - return await request_func(method, params) - except CannotHandleRequest: - continue - else: - raise UnhandledRequest( - "No providers responded to the RPC request:\n" - "method:{0}\n" - "params:{1}\n".format( - method, - params, - ) - ) + request_func = self.provider.request_func( + self.web3, + tuple(self.middleware_stack)) + self.logger.debug("Making request. Method: %s", method) + return await request_func(method, params) def request_blocking(self, method, params): """