use eth.constants for ZERO_ADDRESS

curvefi · Feb 19, 2024 · cde0bad · cde0bad
1 parent 7e563c4
commit cde0bad
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 22 deletions.
diff --git a/scripts/utils/constants.py b/scripts/utils/constants.py
@@ -1,8 +1,8 @@
 from os.path import abspath, dirname, join
 
-BASE_DIR = join(dirname(abspath(__file__)), "..")
+from eth.constants import ZERO_ADDRESS
 
-ZERO_ADDRESS = "0x0000000000000000000000000000000000000000"
+BASE_DIR = join(dirname(abspath(__file__)), "..")
 
 ADDRESS_PROVIDER = "0x0000000022D53366457F9d5E68Ec105046FC4383"
 STABLE_REGISTRY_ADDRESS = "0x90E00ACe148ca3b23Ac1bC8C240C2a7Dd9c2d7f5"

diff --git a/tests/mainnet/metaregistry/api/test_find_pool_for_coins.py b/tests/mainnet/metaregistry/api/test_find_pool_for_coins.py
@@ -2,8 +2,7 @@
 from os import environ
 
 import pytest
-
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 # NOTE: This is the most important method in the metaregistry contract since it will be used
 # by integrators to find pools for coin pairs. It finds pools even if the coin pair is not

diff --git a/tests/mainnet/metaregistry/api/test_get_base_pool.py b/tests/mainnet/metaregistry/api/test_get_base_pool.py
@@ -1,4 +1,4 @@
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def test_all(populated_metaregistry, populated_base_pool_registry, pool):

diff --git a/tests/mainnet/metaregistry/api/test_get_coin_indices.py b/tests/mainnet/metaregistry/api/test_get_coin_indices.py
@@ -2,8 +2,7 @@
 import warnings
 
 import pytest
-
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def _reject_pools_with_one_coin(metaregistry, pool):

diff --git a/tests/mainnet/metaregistry/api/test_get_gauge.py b/tests/mainnet/metaregistry/api/test_get_gauge.py
@@ -1,6 +1,5 @@
 from boa import BoaError
-
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def _is_dao_onboarded_gauge(_gauge, gauge_controller, liquidity_gauge):

diff --git a/tests/mainnet/metaregistry/api/test_get_n_coins.py b/tests/mainnet/metaregistry/api/test_get_n_coins.py
@@ -1,4 +1,4 @@
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def _get_n_coins_for_pool(registry, pool):

diff --git a/tests/mainnet/metaregistry/api/test_get_n_underlying_coins.py b/tests/mainnet/metaregistry/api/test_get_n_underlying_coins.py
@@ -1,4 +1,4 @@
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def _get_num_coins(registry, pool, base_pool_registry):

diff --git a/tests/mainnet/metaregistry/api/test_get_pool_name.py b/tests/mainnet/metaregistry/api/test_get_pool_name.py
@@ -1,5 +1,6 @@
+from eth.constants import ZERO_ADDRESS
+
 from scripts.deployment_utils import get_deployed_contract
-from scripts.utils.constants import ZERO_ADDRESS
 
 
 def test_stable_registry_pools(

diff --git a/tests/mainnet/metaregistry/api/test_get_underlying_balances.py b/tests/mainnet/metaregistry/api/test_get_underlying_balances.py
@@ -2,9 +2,9 @@
 
 import pytest
 from boa import BoaError
+from eth.constants import ZERO_ADDRESS
 
 from scripts.utils import get_deployed_contract
-from scripts.utils.constants import ZERO_ADDRESS
 from tests.utils import assert_negative_coin_balance
 
 EXCEPTION_POOLS = ["0x79a8C46DeA5aDa233ABaFFD40F3A0A2B1e5A4F27"]

diff --git a/tests/mainnet/metaregistry/api/test_get_underlying_coins.py b/tests/mainnet/metaregistry/api/test_get_underlying_coins.py
@@ -2,8 +2,7 @@
 
 import boa
 from boa import BoaError
-
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def _get_underlying_coins(

diff --git a/tests/mainnet/metaregistry/api/test_get_underlying_decimals.py b/tests/mainnet/metaregistry/api/test_get_underlying_decimals.py
@@ -1,8 +1,8 @@
 import pytest
 from boa import BoaError
+from eth.constants import ZERO_ADDRESS
 
 from scripts.utils import get_deployed_contract
-from scripts.utils.constants import ZERO_ADDRESS
 
 EXCEPTIONS = {
     # eth: ankreth pool returns [18, 0] when it should return:

diff --git a/tests/mainnet/metaregistry/api/test_get_virtual_price.py b/tests/mainnet/metaregistry/api/test_get_virtual_price.py
@@ -4,9 +4,9 @@
 import pytest
 from boa import BoaError
 from eth.codecs.abi.exceptions import DecodeError as ABIDecodeError
+from eth.constants import ZERO_ADDRESS
 
 from scripts.utils import get_deployed_contract
-from scripts.utils.constants import ZERO_ADDRESS
 from tests.utils import assert_decode_error, assert_negative_coin_balance
 
 # ---- sanity checks since vprice getters can revert for specific pools states ----

diff --git a/tests/mainnet/metaregistry/api/test_pool_is_metapool.py b/tests/mainnet/metaregistry/api/test_pool_is_metapool.py
@@ -1,4 +1,4 @@
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def test_stable_registry_pools(

diff --git a/tests/mainnet/metaregistry/test_base_registry_tracking.py b/tests/mainnet/metaregistry/test_base_registry_tracking.py
@@ -1,4 +1,4 @@
-from scripts.utils.constants import ZERO_ADDRESS
+from eth.constants import ZERO_ADDRESS
 
 
 def test_new_crypto_factory_pool(

diff --git a/tests/mainnet/registries/test_add_remove_basepool.py b/tests/mainnet/registries/test_add_remove_basepool.py
@@ -1,6 +1,6 @@
 import boa
+from eth.constants import ZERO_ADDRESS
 
-from scripts.utils.constants import ZERO_ADDRESS
 from tests.utils import deploy_contract
 
 

diff --git a/tests/mainnet/registries/test_add_remove_metapool.py b/tests/mainnet/registries/test_add_remove_metapool.py
@@ -1,6 +1,6 @@
 import boa
+from eth.constants import ZERO_ADDRESS
 
-from scripts.utils.constants import ZERO_ADDRESS
 from tests.utils import deploy_contract
 
 

diff --git a/tests/mainnet/registries/test_add_remove_pool.py b/tests/mainnet/registries/test_add_remove_pool.py
@@ -1,6 +1,6 @@
 import boa
+from eth.constants import ZERO_ADDRESS
 
-from scripts.utils.constants import ZERO_ADDRESS
 from tests.utils import deploy_contract