Merge pull request #1033 from dylanjw/_utils

Move web3.utils to web3._utils
ethereum · Sep 19, 2018 · 3d14361 · 3d14361
2 parents a8a5032 + 7b13fd5
commit 3d14361
Show file tree

Hide file tree

Showing 129 changed files with 374 additions and 330 deletions.
diff --git a/conftest.py b/conftest.py
@@ -2,13 +2,15 @@
 import time
 import warnings
 
+from web3._utils.threads import (
+    Timeout,
+)
+from web3.main import (
+    Web3,
+)
 from web3.providers.eth_tester import (
     EthereumTesterProvider,
 )
-from web3.utils.threads import (
-    Timeout,
-)
-from web3.main import Web3
 
 
 class PollDelayCounter:

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -4,7 +4,7 @@
     to_bytes,
 )
 
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     identity,
 )
 

diff --git a/tests/core/caching-utils/test_generate_cache_key.py b/tests/core/caching-utils/test_generate_cache_key.py
@@ -8,7 +8,7 @@
     strategies as st,
 )
 
-from web3.utils.caching import (
+from web3._utils.caching import (
     generate_cache_key,
 )
 

diff --git a/tests/core/contracts/test_args_and_kwargs_merger.py b/tests/core/contracts/test_args_and_kwargs_merger.py
@@ -1,6 +1,6 @@
 import pytest
 
-from web3.utils.abi import (
+from web3._utils.abi import (
     merge_args_and_kwargs,
 )
 

diff --git a/tests/core/contracts/test_contract_ambiguous_functions.py b/tests/core/contracts/test_contract_ambiguous_functions.py
@@ -4,7 +4,7 @@
     HexBytes,
 )
 
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     compose,
     curry,
 )

diff --git a/tests/core/contracts/test_contract_buildTransaction.py b/tests/core/contracts/test_contract_buildTransaction.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     dissoc,
 )
 

diff --git a/tests/core/contracts/test_contract_call_interface.py b/tests/core/contracts/test_contract_call_interface.py
@@ -13,6 +13,12 @@
     HexBytes,
 )
 
+from web3._utils.ens import (
+    contract_ens_addresses,
+)
+from web3._utils.toolz import (
+    identity,
+)
 from web3.exceptions import (
     BadFunctionCallOutput,
     BlockNumberOutofRange,
@@ -21,12 +27,6 @@
     NoABIFunctionsFound,
     ValidationError,
 )
-from web3.utils.ens import (
-    contract_ens_addresses,
-)
-from web3.utils.toolz import (
-    identity,
-)
 
 # Ignore warning in pyethereum 1.6 - will go away with the upgrade
 pytestmark = pytest.mark.filterwarnings("ignore:implicit cast from 'char *'")

diff --git a/tests/core/contracts/test_contract_init.py b/tests/core/contracts/test_contract_init.py
@@ -1,13 +1,13 @@
 import pytest
 
+from web3._utils.ens import (
+    contract_ens_addresses,
+    ens_addresses,
+)
 from web3.exceptions import (
     BadFunctionCallOutput,
     NameNotFound,
 )
-from web3.utils.ens import (
-    contract_ens_addresses,
-    ens_addresses,
-)
 
 
 @pytest.fixture()

diff --git a/tests/core/contracts/test_contract_method_to_argument_matching.py b/tests/core/contracts/test_contract_method_to_argument_matching.py
@@ -1,15 +1,15 @@
 import json
 import pytest
 
-from web3.exceptions import (
-    ValidationError,
-)
-from web3.utils.abi import (
+from web3._utils.abi import (
     get_abi_input_types,
 )
-from web3.utils.function_identifiers import (
+from web3._utils.function_identifiers import (
     FallbackFn,
 )
+from web3.exceptions import (
+    ValidationError,
+)
 
 SINGLE_FN_NO_ARGS = json.loads('[{"constant":false,"inputs":[],"name":"a","outputs":[],"type":"function"}]')  # noqa: E501
 SINGLE_FN_ONE_ARG = json.loads('[{"constant":false,"inputs":[{"name":"","type":"uint256"}],"name":"a","outputs":[],"type":"function"}]')  # noqa: E501

diff --git a/tests/core/contracts/test_contract_transact_interface.py b/tests/core/contracts/test_contract_transact_interface.py
@@ -6,7 +6,7 @@
     to_bytes,
 )
 
-from web3.utils.empty import (
+from web3._utils.empty import (
     empty,
 )
 

diff --git a/tests/core/contracts/test_extracting_event_data.py b/tests/core/contracts/test_extracting_event_data.py
@@ -4,7 +4,7 @@
     is_same_address,
 )
 
-from web3.utils.events import (
+from web3._utils.events import (
     get_event_data,
 )
 

diff --git a/tests/core/contracts/test_extracting_event_data_old.py b/tests/core/contracts/test_extracting_event_data_old.py
@@ -4,7 +4,7 @@
     is_same_address,
 )
 
-from web3.utils.events import (
+from web3._utils.events import (
     get_event_data,
 )
 

diff --git a/tests/core/core/block-utils/test_select_method_for_block_identifier.py b/tests/core/core/block-utils/test_select_method_for_block_identifier.py
@@ -1,9 +1,9 @@
 import pytest
 
-from web3.utils.blocks import (
+from web3._utils.blocks import (
     select_method_for_block_identifier,
 )
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     partial,
 )
 

diff --git a/tests/core/empty-object/test_empty_object_is_falsy.py b/tests/core/empty-object/test_empty_object_is_falsy.py
@@ -1,4 +1,4 @@
-from web3.utils.empty import (
+from web3._utils.empty import (
     empty,
 )
 

diff --git a/tests/core/eth-module/test_accounts.py b/tests/core/eth-module/test_accounts.py
@@ -16,16 +16,16 @@
     Account,
     Web3,
 )
-from web3.providers.eth_tester import (
-    EthereumTesterProvider,
-)
-from web3.utils.encoding import (
+from web3._utils.encoding import (
     to_bytes,
     to_hex,
 )
-from web3.utils.toolz import (
+from web3._utils.toolz import (
     dissoc,
 )
+from web3.providers.eth_tester import (
+    EthereumTesterProvider,
+)
 
 # from https://github.com/ethereum/tests/blob/3930ca3a9a377107d5792b3e7202f79c688f1a67/BasicTests/txtest.json # noqa: 501
 ETH_TEST_TRANSACTIONS = [

diff --git a/tests/core/filtering/test_existing_filter_instance.py b/tests/core/filtering/test_existing_filter_instance.py
@@ -1,11 +1,11 @@
 import pytest
 
+from web3._utils.threads import (
+    Timeout,
+)
 from web3.providers.eth_tester import (
     EthereumTesterProvider,
 )
-from web3.utils.threads import (
-    Timeout,
-)
 
 
 @pytest.fixture()

diff --git a/tests/core/filtering/test_filter_against_latest_blocks.py b/tests/core/filtering/test_filter_against_latest_blocks.py
@@ -1,9 +1,9 @@
+from web3._utils.threads import (
+    Timeout,
+)
 from web3.providers.eth_tester import (
     EthereumTesterProvider,
 )
-from web3.utils.threads import (
-    Timeout,
-)
 
 
 def test_sync_filter_against_latest_blocks(web3, sleep_interval, wait_for_block):

diff --git a/tests/core/filtering/test_filter_against_pending_transactions.py b/tests/core/filtering/test_filter_against_pending_transactions.py
@@ -5,7 +5,7 @@
     flaky,
 )
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/filtering/test_filter_against_transaction_logs.py b/tests/core/filtering/test_filter_against_transaction_logs.py
@@ -5,7 +5,7 @@
     flaky,
 )
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/middleware/test_latest_block_based_cache_middleware.py b/tests/core/middleware/test_latest_block_based_cache_middleware.py
@@ -10,6 +10,9 @@
 )
 
 from web3 import Web3
+from web3._utils.caching import (
+    generate_cache_key,
+)
 from web3.middleware import (  # noqa: F401
     construct_error_generator_middleware,
     construct_latest_block_based_cache_middleware,
@@ -18,9 +21,6 @@
 from web3.providers.base import (
     BaseProvider,
 )
-from web3.utils.caching import (
-    generate_cache_key,
-)
 
 
 @pytest.fixture

diff --git a/tests/core/middleware/test_simple_cache_middleware.py b/tests/core/middleware/test_simple_cache_middleware.py
@@ -3,6 +3,9 @@
 import uuid
 
 from web3 import Web3
+from web3._utils.caching import (
+    generate_cache_key,
+)
 from web3.middleware import (
     construct_error_generator_middleware,
     construct_result_generator_middleware,
@@ -11,9 +14,6 @@
 from web3.providers.base import (
     BaseProvider,
 )
-from web3.utils.caching import (
-    generate_cache_key,
-)
 
 
 @pytest.fixture

diff --git a/tests/core/middleware/test_time_based_cache_middleware.py b/tests/core/middleware/test_time_based_cache_middleware.py
@@ -4,6 +4,9 @@
 import uuid
 
 from web3 import Web3
+from web3._utils.caching import (
+    generate_cache_key,
+)
 from web3.middleware import (  # noqa: F401
     construct_error_generator_middleware,
     construct_result_generator_middleware,
@@ -12,9 +15,6 @@
 from web3.providers.base import (
     BaseProvider,
 )
-from web3.utils.caching import (
-    generate_cache_key,
-)
 
 
 @pytest.fixture

diff --git a/tests/core/middleware/test_transaction_signing.py b/tests/core/middleware/test_transaction_signing.py
@@ -11,6 +11,11 @@
 )
 
 from web3 import Web3
+from web3._utils.toolz import (
+    identity,
+    merge,
+    valfilter,
+)
 from web3.exceptions import (
     InvalidAddress,
 )
@@ -27,11 +32,6 @@
 from web3.providers.eth_tester import (
     EthereumTesterProvider,
 )
-from web3.utils.toolz import (
-    identity,
-    merge,
-    valfilter,
-)
 
 PRIVATE_KEY_1 = to_bytes(
     hexstr='0x6a8b4de52b288e111c14e1c4b868bc125d325d40331d86d875a3467dd44bf829')

diff --git a/tests/core/mining-module/test_miner_setExtra.py b/tests/core/mining-module/test_miner_setExtra.py
@@ -7,7 +7,7 @@
     flaky,
 )
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/mining-module/test_miner_setGasPrice.py b/tests/core/mining-module/test_miner_setGasPrice.py
@@ -4,7 +4,7 @@
     flaky,
 )
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/mining-module/test_miner_start.py b/tests/core/mining-module/test_miner_start.py
@@ -4,7 +4,7 @@
     flaky,
 )
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/mining-module/test_miner_stop.py b/tests/core/mining-module/test_miner_stop.py
@@ -4,7 +4,7 @@
     flaky,
 )
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/txpool-module/test_txpool_content.py b/tests/core/txpool-module/test_txpool_content.py
@@ -1,6 +1,6 @@
 import random
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/txpool-module/test_txpool_inspect.py b/tests/core/txpool-module/test_txpool_inspect.py
@@ -1,6 +1,6 @@
 import random
 
-from web3.utils.threads import (
+from web3._utils.threads import (
     Timeout,
 )
 

diff --git a/tests/core/utilities/test_abi.py b/tests/core/utilities/test_abi.py
@@ -1,11 +1,11 @@
 
 import pytest
 
-from web3.utils.abi import (
+from web3._utils.abi import (
     abi_data_tree,
     map_abi_data,
 )
-from web3.utils.normalizers import (
+from web3._utils.normalizers import (
     BASE_RETURN_NORMALIZERS,
 )
 

diff --git a/tests/core/utilities/test_abi_filter_by_abi_name.py b/tests/core/utilities/test_abi_filter_by_abi_name.py
@@ -1,6 +1,6 @@
 import pytest
 
-from web3.utils.abi import (
+from web3._utils.abi import (
     filter_by_name,
 )