Changes from comments on PR #2819

Author: fselmo

web3/_utils/contracts.py

@@ -439,10 +439,10 @@ def parse_block_identifier_int(w3: "Web3", block_identifier_int: int) -> BlockNu
 
 
 def parse_block_identifier_no_extra_call(
-    async_w3: Union["Web3", "AsyncWeb3"], block_identifier: BlockIdentifier
+    w3: Union["Web3", "AsyncWeb3"], block_identifier: BlockIdentifier
 ) -> BlockIdentifier:
     if block_identifier is None:
-        return async_w3.eth.default_block
+        return w3.eth.default_block
     elif isinstance(block_identifier, int) and block_identifier >= 0:
         return block_identifier
     elif block_identifier in ["latest", "earliest", "pending", "safe", "finalized"]:

web3/contract/async_contract.py

@@ -249,9 +249,7 @@ def find_functions_by_identifier(
     def get_function_by_identifier(
         cls, fns: Sequence["AsyncContractFunction"], identifier: str
     ) -> "AsyncContractFunction":
-        return cast(
-            "AsyncContractFunction", get_function_by_identifier(fns, identifier)
-        )
+        return get_function_by_identifier(fns, identifier)
 
 
 class AsyncContractConstructor(BaseContractConstructor):

web3/contract/base_contract.py

@@ -111,6 +111,7 @@
     EventData,
     FilterParams,
     FunctionIdentifier,
+    TContractFn,
     TxParams,
     TxReceipt,
 )
@@ -1087,7 +1088,7 @@ def __hasattr__(self, event_name: str) -> bool:
 
     @staticmethod
     def call_function(
-        fn: Union["ContractFunction", "AsyncContractFunction"],
+        fn: TContractFn,
         *args: Any,
         transaction: Optional[TxParams] = None,
         block_identifier: BlockIdentifier = "latest",

web3/contract/contract.py

@@ -371,7 +371,7 @@ def find_functions_by_identifier(
     def get_function_by_identifier(
         cls, fns: Sequence["ContractFunction"], identifier: str
     ) -> "ContractFunction":
-        return cast("ContractFunction", get_function_by_identifier(fns, identifier))
+        return get_function_by_identifier(fns, identifier)
 
 
 class ContractConstructor(BaseContractConstructor):

web3/contract/utils.py

@@ -50,6 +50,7 @@
     BlockIdentifier,
     CallOverride,
     FunctionIdentifier,
+    TContractFn,
     TxParams,
 )
 
@@ -240,8 +241,8 @@ def find_functions_by_identifier(
     w3: Union["Web3", "AsyncWeb3"],
     address: ChecksumAddress,
     callable_check: Callable[..., Any],
-    function_type: Type[Union["ContractFunction", "AsyncContractFunction"]],
-) -> List[Union["ContractFunction", "AsyncContractFunction"]]:
+    function_type: Type[TContractFn],
+) -> List[TContractFn]:
     fns_abi = filter_by_type("function", contract_abi)
     return [
         function_type.factory(
@@ -258,8 +259,8 @@ def find_functions_by_identifier(
 
 
 def get_function_by_identifier(
-    fns: Sequence[Union["ContractFunction", "AsyncContractFunction"]], identifier: str
-) -> Union["ContractFunction", "AsyncContractFunction"]:
+    fns: Sequence[TContractFn], identifier: str
+) -> TContractFn:
     if len(fns) > 1:
         raise ValueError(
             f"Found multiple functions with matching {identifier}. " f"Found: {fns!r}"

web3/eth/async_eth.py

@@ -557,15 +557,15 @@ async def uninstall_filter(self, filter_id: HexStr) -> bool:
 
     @overload
     def contract(self, address: None = None, **kwargs: Any) -> Type[AsyncContract]:
-        ...  # noqa: E704,E501
+        ...
 
-    @overload  # noqa: F811
+    @overload
     def contract(
         self, address: Union[Address, ChecksumAddress, ENS], **kwargs: Any
     ) -> AsyncContract:
-        ...  # noqa: E704,E501
+        ...
 
-    def contract(  # noqa: F811
+    def contract(
         self,
         address: Optional[Union[Address, ChecksumAddress, ENS]] = None,
         **kwargs: Any,

web3/eth/eth.py

@@ -643,15 +643,15 @@ def sign_munger(
 
     @overload
     def contract(self, address: None = None, **kwargs: Any) -> Type[Contract]:
-        ...  # noqa: E704,E501
+        ...
 
-    @overload  # noqa: F811
+    @overload
     def contract(
         self, address: Union[Address, ChecksumAddress, ENS], **kwargs: Any
     ) -> Contract:
-        ...  # noqa: E704,E501
+        ...
 
-    def contract(  # noqa: F811
+    def contract(
         self,
         address: Optional[Union[Address, ChecksumAddress, ENS]] = None,
         **kwargs: Any,

web3/main.py

@@ -282,7 +282,7 @@ def keccak(
 
     @classmethod
     def normalize_values(
-        cls, w3: "BaseWeb3", abi_types: List[TypeStr], values: List[Any]
+        cls, _w3: "BaseWeb3", abi_types: List[TypeStr], values: List[Any]
     ) -> List[Any]:
         return map_abi_data(zip(abi_types, values))
 

web3/types.py

@@ -37,6 +37,8 @@
 )
 
 if TYPE_CHECKING:
+    from web3.contract.async_contract import AsyncContractFunction  # noqa: F401
+    from web3.contract.contract import ContractFunction  # noqa: F401
     from web3.main import (  # noqa: F401
         AsyncWeb3,
         Web3,
@@ -434,3 +436,8 @@ class GethWallet(TypedDict):
     accounts: Sequence[Dict[str, str]]
     status: str
     url: str
+
+
+# Contract types
+
+TContractFn = TypeVar("TContractFn", "ContractFunction", "AsyncContractFunction")