fix: fixed typing

ErikBjare · ErikBjare · commit f0f244fde910 · 2022-07-14T12:35:32.000+02:00
diff --git a/uniswap/decorators.py b/uniswap/decorators.py
@@ -1,7 +1,8 @@
 import functools
-from typing import Callable, Any, List, TYPE_CHECKING, TypeVar
+from typing import Callable, List, TYPE_CHECKING, TypeVar, Optional
 from typing_extensions import ParamSpec, Concatenate
 
+from .types import AddressLike
 from .constants import ETH_ADDRESS
 
 if TYPE_CHECKING:
@@ -13,15 +14,15 @@
 
 
 def check_approval(
-    method: Callable[Concatenate[Uniswap, P], T]
-) -> Callable[Concatenate[Uniswap, P], T]:
+    method: Callable[Concatenate["Uniswap", P], T]
+) -> Callable[Concatenate["Uniswap", P], T]:
     """Decorator to check if user is approved for a token. It approves them if they
     need to be approved."""
 
     @functools.wraps(method)
-    def approved(self: Any, *args: Any, **kwargs: Any) -> Any:
+    def approved(self: "Uniswap", *args: P.args, **kwargs: P.kwargs) -> T:
         # Check to see if the first token is actually ETH
-        token = args[0] if args[0] != ETH_ADDRESS else None
+        token: Optional[AddressLike] = args[0] if args[0] != ETH_ADDRESS else None  # type: ignore
         token_two = None
 
         # Check second token, if needed
@@ -42,11 +43,11 @@ def approved(self: Any, *args: Any, **kwargs: Any) -> Any:
 def supports(
     versions: List[int],
 ) -> Callable[
-    [Callable[Concatenate[Uniswap, P], T]], Callable[Concatenate[Uniswap, P], T]
+    [Callable[Concatenate["Uniswap", P], T]], Callable[Concatenate["Uniswap", P], T]
 ]:
     def g(
-        f: Callable[Concatenate[Uniswap, P], T]
-    ) -> Callable[Concatenate[Uniswap, P], T]:
+        f: Callable[Concatenate["Uniswap", P], T]
+    ) -> Callable[Concatenate["Uniswap", P], T]:
         if f.__doc__ is None:
             f.__doc__ = ""
         f.__doc__ += """\n\n
diff --git a/uniswap/types.py b/uniswap/types.py
@@ -1,6 +1,5 @@
 from typing import Union
-from web3.eth import Contract  # noqa: F401
-from web3.types import Address, ChecksumAddress
+from eth_typing.evm import Address, ChecksumAddress
 
 
 AddressLike = Union[Address, ChecksumAddress]
diff --git a/uniswap/util.py b/uniswap/util.py
@@ -5,8 +5,9 @@
 
 from web3 import Web3
 from web3.exceptions import NameNotFound
+from web3.contract import Contract
 
-from .types import AddressLike, Address, Contract
+from .types import AddressLike, Address
 
 
 def _str_to_addr(s: Union[AddressLike, str]) -> Address:
