Some cleanup. Leave async typing decisions to upcoming PR.

- No need for the ``Net`` module to be the only one to have to `cast` values because the `net` property on `Web3` is a `Union[Net, AsyncNet]`. Instead, set it like the others and make one decision for all at the same time in an upcoming PR.

Author: fselmo

tests/core/providers/test_async_http_provider.py

@@ -51,8 +51,8 @@ def test_web3_with_async_http_provider_has_default_middlewares_and_modules() ->
     # assert default modules
 
     assert isinstance(async_w3.eth, AsyncEth)
-    assert isinstance(async_w3.geth, Geth)
     assert isinstance(async_w3.net, AsyncNet)
+    assert isinstance(async_w3.geth, Geth)
     assert isinstance(async_w3.geth.admin, AsyncGethAdmin)
     assert isinstance(async_w3.geth.personal, AsyncGethPersonal)
     assert isinstance(async_w3.geth.txpool, AsyncGethTxPool)

web3/_utils/module_testing/net_module.py

@@ -1,7 +1,6 @@
 import pytest
 from typing import (
     TYPE_CHECKING,
-    cast,
 )
 
 from eth_utils import (
@@ -16,7 +15,7 @@
 
 class NetModuleTest:
     def test_net_version(self, w3: "Web3") -> None:
-        version = cast(str, w3.net.version)
+        version = w3.net.version
 
         assert is_string(version)
         assert version.isdigit()

web3/_utils/normalizers.py

@@ -218,7 +218,7 @@ def abi_ens_resolver(
             )
 
         _ens = cast(ENS, w3.ens)
-        net_version = int(cast(str, w3.net.version)) if hasattr(w3, "net") else None
+        net_version = int(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"

web3/main.py

@@ -237,7 +237,7 @@ def to_checksum_address(value: Union[AnyAddress, str, bytes]) -> ChecksumAddress
     # mypy Types
     eth: Eth
     geth: Geth
-    net: Union[Net, AsyncNet]
+    net: Net
 
     def __init__(
         self,

web3/manager.py

@@ -111,10 +111,11 @@ def __init__(
             self.provider = provider
 
         if middlewares is None:
-            if self.provider.is_async:
-                middlewares = self.async_default_middlewares(w3)
-            else:
-                middlewares = self.default_middlewares(w3)
+            middlewares = (
+                self.async_default_middlewares(w3)
+                if self.provider.is_async
+                else self.default_middlewares(w3)
+            )
 
         self.middleware_onion: MiddlewareOnion = NamedElementOnion(middlewares)