Clean up async_net as a separate mypy type from net

- Also minor cleanup that came along with these changes: e.g. expect a more specific error, ``NameNotFound`` for ens test since the async version started to wrongly xpass.

Author: fselmo

tests/core/contracts/test_contract_call_interface.py

@@ -29,6 +29,7 @@
     FallbackNotFound,
     InvalidAddress,
     MismatchedABI,
+    NameNotFound,
     NoABIFound,
     NoABIFunctionsFound,
     ValidationError,
@@ -490,9 +491,9 @@ def test_call_address_reflector_name_array(address_reflector_contract, call):
     assert addresses == result
 
 
-def test_call_reject_invalid_ens_name(address_reflector_contract, call):
+def test_call_rejects_invalid_ens_name(address_reflector_contract, call):
     with contract_ens_addresses(address_reflector_contract, []):
-        with pytest.raises(ValueError):
+        with pytest.raises(NameNotFound):
             call(
                 contract=address_reflector_contract,
                 contract_function="reflect",
@@ -1363,11 +1364,11 @@ async def test_async_call_address_reflector_name_array(
 
 @pytest.mark.xfail
 @pytest.mark.asyncio
-async def test_async_call_reject_invalid_ens_name(
+async def test_async_call_rejects_invalid_ens_name(
     async_address_reflector_contract, async_call
 ):
     with contract_ens_addresses(async_address_reflector_contract, []):
-        with pytest.raises(ValueError):
+        with pytest.raises(NameNotFound):
             await async_call(
                 contract=async_address_reflector_contract,
                 contract_function="reflect",

tests/core/providers/test_async_http_provider.py

@@ -52,7 +52,7 @@ def test_web3_with_async_http_provider_has_default_middlewares_and_modules() ->
 
     assert isinstance(async_w3.eth, AsyncEth)
     assert isinstance(async_w3.geth, Geth)
-    assert isinstance(async_w3.async_net, AsyncNet)
+    assert isinstance(async_w3.net, AsyncNet)
     assert isinstance(async_w3.geth.admin, AsyncGethAdmin)
     assert isinstance(async_w3.geth.personal, AsyncGethPersonal)
     assert isinstance(async_w3.geth.txpool, AsyncGethTxPool)

tests/integration/go_ethereum/test_goethereum_http.py

@@ -129,22 +129,22 @@ class TestGoEthereumAsyncAdminModuleTest(GoEthereumAsyncAdminModuleTest):
     @pytest.mark.xfail(
         reason="running geth with the --nodiscover flag doesn't allow peer addition"
     )
-    async def test_admin_peers(self, w3: "Web3") -> None:
-        await super().test_admin_peers(w3)
+    async def test_admin_peers(self, async_w3: "Web3") -> None:
+        await super().test_admin_peers(async_w3)
 
     @pytest.mark.asyncio
-    async def test_admin_start_stop_http(self, w3: "Web3") -> None:
+    async def test_admin_start_stop_http(self, async_w3: "Web3") -> None:
         # This test causes all tests after it to fail on CI if it's allowed to run
         pytest.xfail(
             reason="Only one HTTP endpoint is allowed to be active at any time"
         )
-        await super().test_admin_start_stop_http(w3)
+        await super().test_admin_start_stop_http(async_w3)
 
     @pytest.mark.asyncio
-    async def test_admin_start_stop_ws(self, w3: "Web3") -> None:
+    async def test_admin_start_stop_ws(self, async_w3: "Web3") -> None:
         # This test causes all tests after it to fail on CI if it's allowed to run
         pytest.xfail(reason="Only one WS endpoint is allowed to be active at any time")
-        await super().test_admin_start_stop_ws(w3)
+        await super().test_admin_start_stop_ws(async_w3)
 
 
 class TestGoEthereumAsyncNetModuleTest(GoEthereumAsyncNetModuleTest):

web3/_utils/contracts.py

@@ -208,11 +208,13 @@ def encode_abi(
         )
 
     normalizers = [
-        abi_ens_resolver(w3),
         abi_address_to_hex,
         abi_bytes_to_bytes,
         abi_string_to_text,
     ]
+    if not w3.eth.is_async:
+        normalizers.append(abi_ens_resolver(w3))
+
     normalized_arguments = map_abi_data(
         normalizers,
         argument_types,

web3/_utils/module_testing/net_module.py

@@ -1,6 +1,7 @@
 import pytest
 from typing import (
     TYPE_CHECKING,
+    cast,
 )
 
 from eth_utils import (
@@ -15,7 +16,7 @@
 
 class NetModuleTest:
     def test_net_version(self, w3: "Web3") -> None:
-        version = w3.net.version
+        version = cast(str, w3.net.version)
 
         assert is_string(version)
         assert version.isdigit()
@@ -34,19 +35,19 @@ def test_net_peer_count(self, w3: "Web3") -> None:
 class AsyncNetModuleTest:
     @pytest.mark.asyncio
     async def test_net_version(self, async_w3: "Web3") -> None:
-        version = await async_w3.async_net.version
+        version = await async_w3.net.version  # type: ignore
 
         assert is_string(version)
         assert version.isdigit()
 
     @pytest.mark.asyncio
     async def test_net_listening(self, async_w3: "Web3") -> None:
-        listening = await async_w3.async_net.listening
+        listening = await async_w3.net.listening  # type: ignore
 
         assert is_boolean(listening)
 
     @pytest.mark.asyncio
     async def test_net_peer_count(self, async_w3: "Web3") -> None:
-        peer_count = await async_w3.async_net.peer_count
+        peer_count = await async_w3.net.peer_count  # type: ignore
 
         assert is_integer(peer_count)

web3/_utils/normalizers.py

@@ -205,7 +205,11 @@ def abi_address_to_hex(
 
 
 @curry
-def abi_ens_resolver(w3: "Web3", type_str: TypeStr, val: Any) -> Tuple[TypeStr, Any]:
+def abi_ens_resolver(
+    w3: "Web3",
+    type_str: TypeStr,
+    val: Any,
+) -> Tuple[TypeStr, Any]:
     if type_str == "address" and is_ens_name(val):
         if w3 is None:
             raise InvalidAddress(
@@ -214,11 +218,12 @@ def abi_ens_resolver(w3: "Web3", type_str: TypeStr, val: Any) -> Tuple[TypeStr,
             )
 
         _ens = cast(ENS, w3.ens)
+        net_version = int(cast(str, w3.net.version)) if hasattr(w3, "net") else None
         if _ens is None:
             raise InvalidAddress(
                 f"Could not look up name {val!r} because ENS is" " set to None"
             )
-        elif int(w3.net.version) != 1 and not isinstance(_ens, StaticENS):
+        elif net_version != 1 and not isinstance(_ens, StaticENS):
             raise InvalidAddress(
                 f"Could not look up name {val!r} because web3 is"
                 " not connected to mainnet"

web3/main.py

@@ -133,7 +133,7 @@
 def get_async_default_modules() -> Dict[str, Union[Type[Module], Sequence[Any]]]:
     return {
         "eth": AsyncEth,
-        "async_net": AsyncNet,
+        "net": AsyncNet,
         "geth": (
             Geth,
             {
@@ -237,8 +237,7 @@ def to_checksum_address(value: Union[AnyAddress, str, bytes]) -> ChecksumAddress
     # mypy Types
     eth: Eth
     geth: Geth
-    net: Net
-    async_net: AsyncNet
+    net: Union[Net, AsyncNet]
 
     def __init__(
         self,
@@ -256,10 +255,11 @@ def __init__(
         self.codec = ABICodec(build_default_registry())
 
         if modules is None:
-            if provider and provider.is_async:
-                modules = get_async_default_modules()
-            else:
-                modules = get_default_modules()
+            modules = (
+                get_async_default_modules()
+                if provider and provider.is_async
+                else get_default_modules()
+            )
 
         self.attach_modules(modules)