diff --git a/tests/fixtures/accounts.py b/tests/fixtures/accounts.py index a14f5a1..6dfef0e 100644 --- a/tests/fixtures/accounts.py +++ b/tests/fixtures/accounts.py @@ -2,8 +2,8 @@ import pytest from eth_account.signers.local import LocalAccount -from scripts.constants import ADDRESS_PROVIDER from scripts.deployment_utils import get_deployed_contract +from scripts.utils.constants import ADDRESS_PROVIDER @pytest.fixture(scope="session") diff --git a/tests/fixtures/constants.py b/tests/fixtures/constants.py index a58f123..f838b66 100644 --- a/tests/fixtures/constants.py +++ b/tests/fixtures/constants.py @@ -1,6 +1,6 @@ import pytest -from scripts.constants import BASE_POOLS, CRYPTO_REGISTRY_POOLS +from scripts.utils.constants import BASE_POOLS, CRYPTO_REGISTRY_POOLS @pytest.fixture(scope="module") diff --git a/tests/mainnet/metaregistry/api/test_find_pool_for_coins.py b/tests/mainnet/metaregistry/api/test_find_pool_for_coins.py index 81b77a6..85b0e79 100644 --- a/tests/mainnet/metaregistry/api/test_find_pool_for_coins.py +++ b/tests/mainnet/metaregistry/api/test_find_pool_for_coins.py @@ -3,7 +3,7 @@ import pytest -from scripts.constants import ZERO_ADDRESS +from scripts.utils.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 index f78e1b8..c96d80a 100644 --- 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.constants import ZERO_ADDRESS +from scripts.utils.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 index 287b422..2121745 100644 --- a/tests/mainnet/metaregistry/api/test_get_coin_indices.py +++ b/tests/mainnet/metaregistry/api/test_get_coin_indices.py @@ -3,7 +3,7 @@ import pytest -from scripts.constants import ZERO_ADDRESS +from scripts.utils.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 index 9ea6a7f..a7d8067 100644 --- a/tests/mainnet/metaregistry/api/test_get_gauge.py +++ b/tests/mainnet/metaregistry/api/test_get_gauge.py @@ -1,6 +1,6 @@ from boa import BoaError -from scripts.constants import ZERO_ADDRESS +from scripts.utils.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 index 20f24d2..37a183b 100644 --- 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.constants import ZERO_ADDRESS +from scripts.utils.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 index 16ad66d..9ca6ccc 100644 --- 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.constants import ZERO_ADDRESS +from scripts.utils.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 index a17612a..6a56e2f 100644 --- a/tests/mainnet/metaregistry/api/test_get_pool_name.py +++ b/tests/mainnet/metaregistry/api/test_get_pool_name.py @@ -1,5 +1,5 @@ -from scripts.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 index 8296927..5d2c9ef 100644 --- a/tests/mainnet/metaregistry/api/test_get_underlying_balances.py +++ b/tests/mainnet/metaregistry/api/test_get_underlying_balances.py @@ -3,8 +3,8 @@ import pytest from boa import BoaError -from scripts.constants import ZERO_ADDRESS from scripts.deployment_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 index 91c990a..379c6f1 100644 --- a/tests/mainnet/metaregistry/api/test_get_underlying_coins.py +++ b/tests/mainnet/metaregistry/api/test_get_underlying_coins.py @@ -3,7 +3,7 @@ import boa from boa import BoaError -from scripts.constants import ZERO_ADDRESS +from scripts.utils.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 index a4d9236..2989821 100644 --- 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 scripts.constants import ZERO_ADDRESS from scripts.deployment_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 index e44aeee..d87c90b 100644 --- a/tests/mainnet/metaregistry/api/test_get_virtual_price.py +++ b/tests/mainnet/metaregistry/api/test_get_virtual_price.py @@ -5,8 +5,8 @@ from boa import BoaError from eth.codecs.abi.exceptions import DecodeError as ABIDecodeError -from scripts.constants import ZERO_ADDRESS from scripts.deployment_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 index 3375ba8..89f59f7 100644 --- 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.constants import ZERO_ADDRESS +from scripts.utils.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 index ca776b3..6c889b3 100644 --- a/tests/mainnet/metaregistry/test_base_registry_tracking.py +++ b/tests/mainnet/metaregistry/test_base_registry_tracking.py @@ -1,4 +1,4 @@ -from scripts.constants import ZERO_ADDRESS +from scripts.utils.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 index f96f9ff..d7b2468 100644 --- 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 scripts.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 index fcc1918..a988761 100644 --- 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 scripts.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 index abac879..982176a 100644 --- 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 scripts.constants import ZERO_ADDRESS +from scripts.utils.constants import ZERO_ADDRESS from tests.utils import deploy_contract diff --git a/tests/utils.py b/tests/utils.py index f8d6a55..d26117a 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -6,8 +6,8 @@ from eth.codecs.abi.exceptions import DecodeError as ABIDecodeError from eth_account.signers.local import LocalAccount -from scripts.constants import BASE_DIR, ZERO_ADDRESS from scripts.deployment_utils import get_deployed_contract +from scripts.utils.constants import BASE_DIR, ZERO_ADDRESS def get_contract_pools(contract_name: str, address: str) -> list[str]: