Updates from conversation in pr #2452

Author: fselmo

ens/main.py

@@ -261,8 +261,10 @@ def setup_name(
 
     def resolve(self, name: str, get: str = 'addr') -> Optional[Union[ChecksumAddress, str]]:
         warnings.warn(
-            "In v6, the resolve() method will be made internal and renamed to _resolve(). The "
-            "'get' param name will also change to 'fn_name'.",
+            "In v6, the `ENS.resolve()` method will be made internal and renamed to "
+            "`_resolve()`. It is recommended to use the abstracted resolve functionality of "
+            "`ENS.address()` for forward resolution, and `ENS.name()` for reverse resolution "
+            "instead.",
             category=DeprecationWarning,
         )
 
@@ -278,12 +280,15 @@ def resolve(self, name: str, get: str = 'addr') -> Optional[Union[ChecksumAddres
         else:
             return None
 
-    def resolver(self, normal_name: str) -> Optional['Contract']:
-        warnings.warn(
-            "The function signature for resolver() will change in v6 to accept 'name' as a param, "
-            "over 'normalized_name', and the method will normalize the name internally.",
-            category=FutureWarning,
-        )
+    def resolver(self, normal_name: str, name: str = None) -> Optional['Contract']:
+        if not name:
+            warnings.warn(
+                "The function signature for resolver() will change in v6 to accept `name` as a "
+                "the positional argument, over `normal_name`, and the method will instead "
+                "normalize the name internally. To suppress warnings for now, `name` may be passed "
+                "in as a keyword argument.",
+                category=FutureWarning,
+            )
 
         resolver_addr = self.ens.caller.resolver(normal_name_to_hash(normal_name))
         if is_none_or_zero_address(resolver_addr):

tests/ens/test_v6_warnings.py

@@ -1,19 +1,29 @@
 import pytest
+import warnings
 
 
 def test_resolve_deprecation_warning(ens):
     with pytest.warns(
         DeprecationWarning,
-        match="In v6, the resolve\\(\\) method will be made internal and renamed to "
-              "_resolve\\(\\). The 'get' param name will also change to 'fn_name'.",
+        match="In v6, the `ENS.resolve\\(\\)` method will be made internal and renamed to "
+            "`_resolve\\(\\)`. It is recommended to use the abstracted resolve functionality of "
+            "`ENS.address\\(\\)` for forward resolution, and `ENS.name\\(\\)` for reverse "
+            "resolution instead."
     ):
         ens.resolve('tester.eth')
 
 
 def test_resolver_future_warning(ens):
     with pytest.warns(
         FutureWarning,
-        match="The function signature for resolver\\(\\) will change in v6 to accept 'name' as a "
-              "param, over 'normalized_name', and the method will normalize the name internally.",
+        match="The function signature for resolver\\(\\) will change in v6 to accept `name` as a "
+            "the positional argument, over `normal_name`, and the method will instead "
+            "normalize the name internally. To suppress warnings for now, `name` may be passed "
+            "in as a keyword argument.",
     ):
         ens.resolver('tester.eth')
+
+    # assert no warning when `name` kwarg is passed in
+    with warnings.catch_warnings():
+        warnings.simplefilter("error")  # turn all warnings to errors
+        ens.resolver('tester.eth', name='tester.eth')