Use top level imports in tests where possible

Author: fjarri

tests/test_abi_types.py

@@ -4,10 +4,8 @@
 import pytest
 from ethereum_rpc import Address, keccak
 
-from pons import abi
+from pons import ABI_JSON, ABIDecodingError, abi
 from pons._abi_types import (
-    ABI_JSON,
-    ABIDecodingError,
     ABIType,
     Type,
     decode_args,

tests/test_client.py

@@ -20,6 +20,7 @@
 from pons import (
     ABIDecodingError,
     AccountSigner,
+    BadResponseFormat,
     BoundEvent,
     Client,
     ClientSession,
@@ -33,11 +34,11 @@
     Method,
     Mutability,
     ProviderError,
+    TransactionFailed,
     abi,
     compile_contract_file,
 )
 from pons._abi_types import encode_args
-from pons._client import BadResponseFormat, TransactionFailed
 from pons._contract_abi import PANIC_ERROR
 from pons._provider import RPC_JSON
 

tests/test_client_rpc.py

@@ -22,6 +22,7 @@
 
 from pons import (
     AccountSigner,
+    BadResponseFormat,
     ClientSession,
     CompiledContract,
     Either,
@@ -31,7 +32,6 @@
     compile_contract_file,
 )
 from pons._abi_types import encode_args
-from pons._client_rpc import BadResponseFormat
 from pons._provider import RPC_JSON
 
 

tests/test_contract.py

@@ -4,8 +4,10 @@
 from ethereum_rpc import Address, BlockHash, LogEntry, LogTopic, TxHash, keccak
 
 from pons import (
+    BoundMethod,
     CompiledContract,
     Constructor,
+    DeployedContract,
     Event,
     Fallback,
     Method,
@@ -14,7 +16,6 @@
     compile_contract_file,
 )
 from pons._abi_types import encode_args
-from pons._contract import BoundMethod, DeployedContract
 
 
 @pytest.fixture

tests/test_fallback_provider.py

@@ -11,13 +11,16 @@
     CycleFallback,
     FallbackProvider,
     HTTPError,
+    InvalidResponse,
     PriorityFallback,
     ProtocolError,
+    Provider,
     ProviderError,
+    ProviderPath,
     Unreachable,
 )
 from pons._fallback_provider import PriorityFallbackStrategy
-from pons._provider import RPC_JSON, InvalidResponse, Provider, ProviderPath, ProviderSession
+from pons._provider import RPC_JSON, ProviderSession
 
 
 def random_request() -> str:

tests/test_provider.py

@@ -19,9 +19,10 @@
     LocalProvider,
     Provider,
     ProviderError,
+    ProviderPath,
     _http_provider_server,  # For monkeypatching purposes
 )
-from pons._provider import RPC_JSON, ProviderPath, ProviderSession
+from pons._provider import RPC_JSON, ProviderSession
 
 
 @pytest.fixture

tests/test_utils.py

@@ -10,8 +10,8 @@
     EVMVersion,
     compile_contract_file,
     get_create2_address,
+    get_create_address,
 )
-from pons._utils import get_create_address
 
 
 @pytest.fixture