Separate BaseEth, Eth, and AsyncEth.

Author: fselmo

ethpm/package.py

@@ -115,7 +115,7 @@ def __init__(
         validate_w3_instance(w3)
 
         self.w3 = w3
-        self.w3.eth.defaultContractFactory = cast(Type[Contract], LinkableContract)
+        self.w3.eth._default_contract_factory = cast(Type[Contract], LinkableContract)
         self.manifest = manifest
         self._uri = uri
 

tests/core/pm-module/conftest.py

@@ -57,7 +57,7 @@ def setup_w3():
     t = EthereumTester(backend=pyevm_backend)
     w3 = Web3(Web3.EthereumTesterProvider(ethereum_tester=t))
     w3.eth.default_account = w3.eth.accounts[0]
-    w3.eth.defaultContractFactory = LinkableContract
+    w3.eth._default_contract_factory = LinkableContract
     w3.enable_unstable_package_management_api()
     return w3
 

tests/core/pm-module/test_registry_integration.py

@@ -25,7 +25,7 @@
 def fresh_w3():
     w3 = Web3(Web3.EthereumTesterProvider())
     w3.eth.default_account = w3.eth.accounts[0]
-    w3.eth.defaultContractFactory = LinkableContract
+    w3.eth._default_contract_factory = LinkableContract
     w3.enable_unstable_package_management_api()
     return w3
 

web3/_utils/blocks.py

@@ -1,5 +1,6 @@
 from typing import (
     Any,
+    Optional,
 )
 
 from eth_utils import (
@@ -57,7 +58,7 @@ def is_hex_encoded_block_number(value: Any) -> bool:
 @curry
 def select_method_for_block_identifier(
     value: Any, if_hash: RPCEndpoint, if_number: RPCEndpoint, if_predefined: RPCEndpoint
-) -> RPCEndpoint:
+) -> Optional[RPCEndpoint]:
     if is_predefined_block_number(value):
         return if_predefined
     elif isinstance(value, bytes):

web3/_utils/filters.py

@@ -303,7 +303,7 @@ def select_filter_method(
     if_new_block_filter: RPCEndpoint,
     if_new_pending_transaction_filter: RPCEndpoint,
     if_new_filter: RPCEndpoint,
-) -> RPCEndpoint:
+) -> Optional[RPCEndpoint]:
 
     if is_string(value):
         if value == "latest":

web3/eth/__init__.py

@@ -0,0 +1,10 @@
+from .async_eth import (  # noqa: F401
+    AsyncEth,
+)
+from .base import (  # noqa: F401
+    BaseEth,
+)
+from .main import (  # noqa: F401
+    Eth,
+    Contract,
+)