uniswap-python
diff --git a/‎tests/test_uniswap.py
Copy file name to clipboardExpand all lines: tests/test_uniswap.py
+5-4Lines changed: 5 additions & 4 deletions b/‎tests/test_uniswap.py
Copy file name to clipboardExpand all lines: tests/test_uniswap.py
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/‎uniswap/util.py
Copy file name to clipboardExpand all lines: uniswap/util.py
+3-3Lines changed: 3 additions & 3 deletions b/‎uniswap/util.py
Copy file name to clipboardExpand all lines: uniswap/util.py
+3-3Lines changed: 3 additions & 3 deletions
@@ -9,10 +9,11 @@
 from time import sleep
 
 from web3 import Web3
+from web3.exceptions import NameNotFound
 
 from uniswap import Uniswap
 from uniswap.constants import ETH_ADDRESS
-from uniswap.exceptions import InvalidToken, InsufficientBalance
+from uniswap.exceptions import InsufficientBalance
 from uniswap.util import _str_to_addr
 
 
@@ -227,7 +228,7 @@ def test_add_liquidity(self, client: Uniswap, web3: Web3, token, max_eth):
         [
             (bat, 0.00001 * ONE_ETH, does_not_raise()),
             (dai, 0.00001 * ONE_ETH, does_not_raise()),
-            ("btc", ONE_ETH, pytest.raises(InvalidToken)),
+            ("btc", ONE_ETH, pytest.raises(NameNotFound)),
         ],
     )
     def test_remove_liquidity(
@@ -251,7 +252,7 @@ def test_remove_liquidity(
             # (eth, bat, 0.00001 * ONE_ETH, ZERO_ADDRESS, does_not_raise),
             # (bat, eth, 0.00001 * ONE_ETH, ZERO_ADDRESS, does_not_raise),
             # (dai, bat, 0.00001 * ONE_ETH, ZERO_ADDRESS, does_not_raise),
-            (dai, "btc", ONE_ETH, None, lambda: pytest.raises(InvalidToken)),
+            (dai, "btc", ONE_ETH, None, lambda: pytest.raises(NameNotFound)),
         ],
     )
     def test_make_trade(
@@ -301,7 +302,7 @@ def test_make_trade(
                 None,
                 lambda: pytest.raises(InsufficientBalance),
             ),
-            (dai, "btc", ONE_ETH, None, lambda: pytest.raises(InvalidToken)),
+            (dai, "btc", ONE_ETH, None, lambda: pytest.raises(NameNotFound)),
         ],
     )
     def test_make_trade_output(
 
@@ -4,9 +4,9 @@
 from typing import Union, List, Tuple
 
 from web3 import Web3
+from web3.exceptions import NameNotFound
 
 from .types import AddressLike, Address, Contract
-from .exceptions import InvalidToken
 
 
 def _str_to_addr(s: Union[AddressLike, str]) -> Address:
@@ -15,7 +15,7 @@ def _str_to_addr(s: Union[AddressLike, str]) -> Address:
         if s.startswith("0x"):
             return Address(bytes.fromhex(s[2:]))
         else:
-            raise Exception(f"Couldn't convert string '{s}' to AddressLike")
+            raise NameNotFound(f"Couldn't convert string '{s}' to AddressLike")
     else:
         return s
 
@@ -29,7 +29,7 @@ def _addr_to_str(a: AddressLike) -> str:
         addr = Web3.toChecksumAddress(a)
         return addr
 
-    raise InvalidToken(a)
+    raise NameNotFound(a)
 
 
 def is_same_address(a1: Union[AddressLike, str], a2: Union[AddressLike, str]) -> bool: