From 27202d78bb7caa6cfde63cc463836f1171eefc26 Mon Sep 17 00:00:00 2001 From: Uxio Fuentefria Date: Tue, 12 Jul 2022 12:35:59 +0200 Subject: [PATCH] Use __all__ for exporting modules - See more: https://docs.python.org/3/tutorial/modules.html#importing-from-a-package --- gnosis/eth/__init__.py | 24 ++++++++++++++++++++++++ gnosis/eth/clients/__init__.py | 12 ++++++++++++ gnosis/eth/oracles/__init__.py | 24 ++++++++++++++++++++++++ gnosis/protocol/__init__.py | 6 ++++++ gnosis/safe/__init__.py | 16 ++++++++++++++++ gnosis/safe/multi_send.py | 3 +-- gnosis/safe/proxy_factory.py | 3 +-- gnosis/safe/safe.py | 2 +- 8 files changed, 85 insertions(+), 5 deletions(-) diff --git a/gnosis/eth/__init__.py b/gnosis/eth/__init__.py index f7691c180..d2064ab0c 100644 --- a/gnosis/eth/__init__.py +++ b/gnosis/eth/__init__.py @@ -2,6 +2,7 @@ from .ethereum_client import ( EthereumClient, EthereumClientProvider, + EthereumTxSent, FromAddressNotFound, GasLimitExceeded, InsufficientFunds, @@ -17,3 +18,26 @@ ) from .ethereum_network import EthereumNetwork, EthereumNetworkNotSupported from .exceptions import InvalidERC20Info, InvalidERC721Info, ParityTraceDecodeException + +__all__ = [ + "EthereumClient", + "EthereumClientProvider", + "EthereumTxSent", + "FromAddressNotFound", + "GasLimitExceeded", + "InsufficientFunds", + "InvalidNonce", + "NonceTooHigh", + "NonceTooLow", + "ReplacementTransactionUnderpriced", + "SenderAccountNotFoundInNode", + "TransactionAlreadyImported", + "TransactionQueueLimitReached", + "TxSpeed", + "UnknownAccount", + "EthereumNetwork", + "EthereumNetworkNotSupported", + "InvalidERC20Info", + "InvalidERC721Info", + "ParityTraceDecodeException", +] diff --git a/gnosis/eth/clients/__init__.py b/gnosis/eth/clients/__init__.py index 764801181..1d5175977 100644 --- a/gnosis/eth/clients/__init__.py +++ b/gnosis/eth/clients/__init__.py @@ -12,3 +12,15 @@ EtherscanRateLimitError, ) from .sourcify import Sourcify + +__all__ = [ + "BlockscoutClient", + "BlockscoutClientException", + "BlockScoutConfigurationProblem", + "ContractMetadata", + "EtherscanClient", + "EtherscanClientConfigurationProblem", + "EtherscanClientException", + "EtherscanRateLimitError", + "Sourcify", +] diff --git a/gnosis/eth/oracles/__init__.py b/gnosis/eth/oracles/__init__.py index 143f866b2..2dc786764 100644 --- a/gnosis/eth/oracles/__init__.py +++ b/gnosis/eth/oracles/__init__.py @@ -22,3 +22,27 @@ YearnOracle, ZerionComposedOracle, ) + +__all__ = [ + "AaveOracle", + "BalancerOracle", + "CannotGetPriceFromOracle", + "ComposedPriceOracle", + "CreamOracle", + "CurveOracle", + "EnzymeOracle", + "InvalidPriceFromOracle", + "KyberOracle", + "MooniswapOracle", + "OracleException", + "PoolTogetherOracle", + "PriceOracle", + "PricePoolOracle", + "SushiswapOracle", + "UnderlyingToken", + "UniswapOracle", + "UniswapV2Oracle", + "UsdPricePoolOracle", + "YearnOracle", + "ZerionComposedOracle", +] diff --git a/gnosis/protocol/__init__.py b/gnosis/protocol/__init__.py index 86857f903..0ef3635aa 100644 --- a/gnosis/protocol/__init__.py +++ b/gnosis/protocol/__init__.py @@ -1,3 +1,9 @@ # flake8: noqa F401 from .gnosis_protocol_api import GnosisProtocolAPI from .order import Order, OrderKind + +__all__ = [ + "GnosisProtocolAPI", + "Order", + "OrderKind", +] diff --git a/gnosis/safe/__init__.py b/gnosis/safe/__init__.py index a871edd4b..6bec607c2 100644 --- a/gnosis/safe/__init__.py +++ b/gnosis/safe/__init__.py @@ -12,3 +12,19 @@ ) from .proxy_factory import ProxyFactory from .safe import Safe, SafeOperation, SafeTx + +__all__ = [ + "CannotEstimateGas", + "CouldNotPayGasWithEther", + "InvalidChecksumAddress", + "InvalidInternalTx", + "InvalidMultisigTx", + "InvalidPaymentToken", + "InvalidSignaturesProvided", + "SafeServiceException", + "SignatureNotProvidedByOwner", + "ProxyFactory", + "Safe", + "SafeOperation", + "SafeTx", +] diff --git a/gnosis/safe/multi_send.py b/gnosis/safe/multi_send.py index dbb9fbdd3..3d8f892fc 100644 --- a/gnosis/safe/multi_send.py +++ b/gnosis/safe/multi_send.py @@ -6,9 +6,8 @@ from hexbytes import HexBytes from web3 import Web3 -from gnosis.eth import EthereumClient +from gnosis.eth import EthereumClient, EthereumTxSent from gnosis.eth.contracts import get_multi_send_contract -from gnosis.eth.ethereum_client import EthereumTxSent from gnosis.eth.typing import EthereumData from gnosis.eth.utils import fast_bytes_to_checksum_address, fast_is_checksum_address diff --git a/gnosis/safe/proxy_factory.py b/gnosis/safe/proxy_factory.py index 7d997f7e8..0d8504e61 100644 --- a/gnosis/safe/proxy_factory.py +++ b/gnosis/safe/proxy_factory.py @@ -5,7 +5,7 @@ from eth_typing import ChecksumAddress from web3.contract import Contract -from gnosis.eth import EthereumClient +from gnosis.eth import EthereumClient, EthereumTxSent from gnosis.eth.contracts import ( get_paying_proxy_deployed_bytecode, get_proxy_1_0_0_deployed_bytecode, @@ -16,7 +16,6 @@ get_proxy_factory_V1_0_0_contract, get_proxy_factory_V1_1_1_contract, ) -from gnosis.eth.ethereum_client import EthereumTxSent from gnosis.eth.utils import compare_byte_code, fast_is_checksum_address try: diff --git a/gnosis/safe/safe.py b/gnosis/safe/safe.py index d566de36b..84906a5ef 100644 --- a/gnosis/safe/safe.py +++ b/gnosis/safe/safe.py @@ -13,6 +13,7 @@ from web3.exceptions import BadFunctionCallOutput from web3.types import BlockIdentifier, Wei +from gnosis.eth import EthereumClient, EthereumTxSent from gnosis.eth.constants import GAS_CALL_DATA_BYTE, NULL_ADDRESS, SENTINEL_ADDRESS from gnosis.eth.contracts import ( get_compatibility_fallback_handler_V1_3_0_contract, @@ -23,7 +24,6 @@ get_safe_V1_1_1_contract, get_safe_V1_3_0_contract, ) -from gnosis.eth.ethereum_client import EthereumClient, EthereumTxSent from gnosis.eth.utils import ( fast_bytes_to_checksum_address, fast_is_checksum_address,