Lint

Author: kclowes

tests/integration/go_ethereum/test_goethereum_http.py

@@ -4,6 +4,12 @@
     get_open_port,
 )
 from web3 import Web3
+from web3.eth import (
+    AsyncEth,
+)
+from web3.providers.rpc import (
+    AsyncHTTPProvider,
+)
 
 from .common import (
     GoEthereumAdminModuleTest,
@@ -15,14 +21,8 @@
     GoEthereumVersionModuleTest,
 )
 from .utils import (
-    wait_for_http,
     wait_for_aiohttp,
-)
-from web3.providers.rpc import (
-    AsyncHTTPProvider,
-)
-from web3.eth import (
-    AsyncEth,
+    wait_for_http,
 )
 
 

tests/integration/go_ethereum/utils.py

@@ -1,8 +1,8 @@
-import aiohttp
 import signal
 import socket
 import time
 
+import aiohttp
 import requests
 
 

web3/eth.py

@@ -1,6 +1,8 @@
 from typing import (
     Any,
+    Awaitable,
     Callable,
+    Coroutine,
     List,
     NoReturn,
     Optional,
@@ -105,21 +107,21 @@
 
 
 class BaseEth(Module):
-    _gas_price: Method[Callable[[], Wei]] = Method(
+    _gas_price: Method[Callable[[], Union[Wei, Awaitable[Any]]]] = Method(
         RPC.eth_gasPrice,
         mungers=None,
     )
 
     @property
-    def gas_price(self) -> Wei:
+    def gas_price(self) -> Union[Coroutine[Any, Any, Wei], Wei]:
         return self._gas_price()
 
 
 class AsyncEth(BaseEth):
     is_async = True
 
     @property
-    async def gas_price(self) -> Wei:
+    async def gas_price(self) -> Coroutine[Any, Any, Wei]:
         return await self._gas_price()
 
 

web3/providers/async_base.py

@@ -2,7 +2,9 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    Awaitable,
     Callable,
+    Coroutine,
     Tuple,
     cast,
 )
@@ -44,7 +46,7 @@ def middlewares(
 
     def request_func(
         self, web3: "Web3", outer_middlewares: MiddlewareOnion
-    ) -> Callable[..., RPCResponse]:
+    ) -> Coroutine[Any, Any, RPCResponse]:
         # Placeholder - manager calls self.provider.request_func
         # Eventually this will handle caching and return make_request
         # along with all the middleware
@@ -75,7 +77,7 @@ async def decode_rpc_response(self, raw_response: bytes) -> RPCResponse:
         text_response = to_text(raw_response)
         return cast(RPCResponse, FriendlyJsonSerde().json_decode(text_response))
 
-    async def isConnected(self) -> bool:
+    async def isConnected(self) -> Awaitable[Any]:
         try:
             response = await self.make_request(RPCEndpoint('web3_clientVersion'), [])
         except IOError: