From d16c240cb5f932a617481e3a9403f4812276a482 Mon Sep 17 00:00:00 2001 From: antazoey Date: Sat, 22 Feb 2025 13:59:06 -0700 Subject: [PATCH] refactor: make config at root lvl --- src/ape/api/transactions.py | 5 ++--- src/ape_accounts/__init__.py | 9 +-------- src/ape_accounts/config.py | 15 --------------- tests/functional/test_transaction.py | 8 ++------ 4 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 src/ape_accounts/config.py diff --git a/src/ape/api/transactions.py b/src/ape/api/transactions.py index 44a28eb840..d80f68d029 100644 --- a/src/ape/api/transactions.py +++ b/src/ape/api/transactions.py @@ -192,8 +192,7 @@ def to_string(self, calldata_repr: Optional["CalldataRepr"] = None) -> str: Args: calldata_repr (:class:`~ape.types.abi.CalldataRepr` | None): Pass "full" - to see the full caldata. Defaults to the value from the config - (``accounts.calldata_repr``). + to see the full calldata. Defaults to the value from the config. Returns: str @@ -202,7 +201,7 @@ def to_string(self, calldata_repr: Optional["CalldataRepr"] = None) -> str: if calldata_repr is None: # If was not specified, use the default value from the config. - calldata_repr = self.config_manager.accounts.calldata_repr + calldata_repr = self.local_project.config.calldata_repr if calldata_repr == "full" or len(data["data"]) <= 9: data["data"] = ( diff --git a/src/ape_accounts/__init__.py b/src/ape_accounts/__init__.py index 8dddb6bfbf..2c9148cf2a 100644 --- a/src/ape_accounts/__init__.py +++ b/src/ape_accounts/__init__.py @@ -1,13 +1,6 @@ from importlib import import_module -from ape.plugins import AccountPlugin, Config, register - - -@register(Config) -def config_class(): - from ape_accounts.config import AccountsConfig - - return AccountsConfig +from ape.plugins import AccountPlugin, register @register(AccountPlugin) diff --git a/src/ape_accounts/config.py b/src/ape_accounts/config.py deleted file mode 100644 index 616701a806..0000000000 --- a/src/ape_accounts/config.py +++ /dev/null @@ -1,15 +0,0 @@ -from ape.api.config import PluginConfig -from ape.utils.abi import CalldataRepr - - -class AccountsConfig(PluginConfig): - """ - Config accounts generally. - """ - - calldata_repr: CalldataRepr = CalldataRepr.abridged - """ - When signing transactions, ``full`` will always show the full - calldata where ``abridged`` shows an abridged version of the data - (enough to see the method ID). Defaults to ``abridged``. - """ diff --git a/tests/functional/test_transaction.py b/tests/functional/test_transaction.py index b8629e4424..5b7d71018c 100644 --- a/tests/functional/test_transaction.py +++ b/tests/functional/test_transaction.py @@ -318,15 +318,11 @@ def test_str_when_data_is_long_shows_first_4_bytes(vyper_contract_instance): assert "data: 0x30783366..." in actual -def test_str_when_data_is_long_and_accounts_configure_full_calldata( +def test_str_when_data_is_long_and_configured_full_calldata( project, vyper_contract_instance ): - """ - Tests against a condition that would cause transactions to - fail with string-encoding errors. - """ txn = vyper_contract_instance.setNumber.as_transaction(123) - with project.temp_config(accounts={"calldata_repr": "full"}): + with project.temp_config(calldata_repr="full"): actual = str(txn) expected = (