Remove backwards-compatibility for ENS mainnet requirement, let NameNotFound raise.

Author: abhinay

tests/core/middleware/test_name_to_address_middleware.py

@@ -7,7 +7,6 @@
     Web3,
 )
 from web3.exceptions import (
-    InvalidAddress,
     NameNotFound,
 )
 from web3.middleware import (
@@ -95,7 +94,7 @@ def test_pass_name_resolver_send_transaction_dict_args(
 
 
 def test_fail_name_resolver(w3):
-    with pytest.raises(InvalidAddress, match=r".*ethereum\.eth.*"):
+    with pytest.raises(NameNotFound, match=r".*ethereum\.eth.*"):
         w3.eth.get_balance("ethereum.eth")
 
 

web3/_utils/normalizers.py

@@ -49,7 +49,6 @@
     text_if_str,
 )
 from web3._utils.ens import (
-    StaticENS,
     async_validate_name_has_address,
     is_ens_name,
     validate_name_has_address,
@@ -60,7 +59,6 @@
 )
 from web3.exceptions import (
     InvalidAddress,
-    NameNotFound,
     Web3ValueError,
 )
 
@@ -224,15 +222,7 @@ def abi_ens_resolver(
                 f"Could not look up name {val!r} because ENS is set to None"
             )
         else:
-            try:
-                return type_str, validate_name_has_address(_ens, val)
-            except NameNotFound as e:
-                # TODO: This try/except is to keep backwards compatibility when we
-                #  removed the mainnet requirement. Remove this in web3.py v7 and allow
-                #  NameNotFound to raise.
-                if not isinstance(_ens, StaticENS):
-                    raise InvalidAddress(f"{e}")
-                raise e
+            return type_str, validate_name_has_address(_ens, val)
     else:
         return type_str, val