work on typing

Author: pacrob

tests/core/contracts/conftest.py

@@ -117,18 +117,6 @@ def NestedTupleContractWithDecodeTuples(w3, NESTED_TUPLE_CONTRACT_DECODE_TUPLES)
     return w3.eth.contract(**NESTED_TUPLE_CONTRACT_DECODE_TUPLES)
 
 
-@pytest.fixture()
-def AsyncNestedTupleContract(async_w3, NESTED_TUPLE_CONTRACT):
-    return async_w3.eth.contract(**NESTED_TUPLE_CONTRACT)
-
-
-@pytest.fixture()
-def AsyncNestedTupleContractWithDecodeTuples(
-    async_w3, NESTED_TUPLE_CONTRACT_DECODE_TUPLES
-):
-    return async_w3.eth.contract(**NESTED_TUPLE_CONTRACT_DECODE_TUPLES)
-
-
 CONTRACT_TUPLE_SOURCE = """
 pragma solidity >=0.4.19 <0.6.0;
 pragma experimental ABIEncoderV2;
@@ -178,11 +166,6 @@ def TupleContract(w3, TUPLE_CONTRACT):
     return w3.eth.contract(**TUPLE_CONTRACT)
 
 
-@pytest.fixture()
-def AsyncTupleContract(async_w3, TUPLE_CONTRACT):
-    return async_w3.eth.contract(**TUPLE_CONTRACT)
-
-
 @pytest.fixture()
 def TUPLE_CONTRACT_DECODE_TUPLES(TUPLE_CODE, TUPLE_RUNTIME, TUPLE_ABI):
     return {
@@ -198,11 +181,6 @@ def TupleContractWithDecodeTuples(w3, TUPLE_CONTRACT_DECODE_TUPLES):
     return w3.eth.contract(**TUPLE_CONTRACT_DECODE_TUPLES)
 
 
-@pytest.fixture()
-def AsyncTupleContractWithDecodeTuples(async_w3, TUPLE_CONTRACT_DECODE_TUPLES):
-    return async_w3.eth.contract(**TUPLE_CONTRACT_DECODE_TUPLES)
-
-
 CONTRACT_CODE = "0x606060405261022e806100126000396000f360606040523615610074576000357c01000000000000000000000000000000000000000000000000000000009004806316216f391461007657806361bc221a146100995780637cf5dab0146100bc578063a5f3c23b146100e8578063d09de08a1461011d578063dcf537b11461014057610074565b005b610083600480505061016c565b6040518082815260200191505060405180910390f35b6100a6600480505061017f565b6040518082815260200191505060405180910390f35b6100d26004808035906020019091905050610188565b6040518082815260200191505060405180910390f35b61010760048080359060200190919080359060200190919050506101ea565b6040518082815260200191505060405180910390f35b61012a6004805050610201565b6040518082815260200191505060405180910390f35b6101566004808035906020019091905050610217565b6040518082815260200191505060405180910390f35b6000600d9050805080905061017c565b90565b60006000505481565b6000816000600082828250540192505081905550600060005054905080507f3496c3ede4ec3ab3686712aa1c238593ea6a42df83f98a5ec7df9834cfa577c5816040518082815260200191505060405180910390a18090506101e5565b919050565b6000818301905080508090506101fb565b92915050565b600061020d6001610188565b9050610214565b90565b60006007820290508050809050610229565b91905056"  # noqa: E501
 CONTRACT_RUNTIME = "0x60606040523615610074576000357c01000000000000000000000000000000000000000000000000000000009004806316216f391461007657806361bc221a146100995780637cf5dab0146100bc578063a5f3c23b146100e8578063d09de08a1461011d578063dcf537b11461014057610074565b005b610083600480505061016c565b6040518082815260200191505060405180910390f35b6100a6600480505061017f565b6040518082815260200191505060405180910390f35b6100d26004808035906020019091905050610188565b6040518082815260200191505060405180910390f35b61010760048080359060200190919080359060200190919050506101ea565b6040518082815260200191505060405180910390f35b61012a6004805050610201565b6040518082815260200191505060405180910390f35b6101566004808035906020019091905050610217565b6040518082815260200191505060405180910390f35b6000600d9050805080905061017c565b90565b60006000505481565b6000816000600082828250540192505081905550600060005054905080507f3496c3ede4ec3ab3686712aa1c238593ea6a42df83f98a5ec7df9834cfa577c5816040518082815260200191505060405180910390a18090506101e5565b919050565b6000818301905080508090506101fb565b92915050565b600061020d6001610188565b9050610214565b90565b60006007820290508050809050610229565b91905056"  # noqa: E501
 CONTRACT_ABI = json.loads(
@@ -1218,11 +1196,23 @@ def AsyncNestedTupleContract(async_w3, NESTED_TUPLE_CONTRACT):
     return async_w3.eth.contract(**NESTED_TUPLE_CONTRACT)
 
 
+@pytest.fixture()
+def AsyncNestedTupleContractWithDecodeTuples(
+    async_w3, NESTED_TUPLE_CONTRACT_DECODE_TUPLES
+):
+    return async_w3.eth.contract(**NESTED_TUPLE_CONTRACT_DECODE_TUPLES)
+
+
 @pytest.fixture()
 def AsyncTupleContract(async_w3, TUPLE_CONTRACT):
     return async_w3.eth.contract(**TUPLE_CONTRACT)
 
 
+@pytest.fixture()
+def AsyncTupleContractWithDecodeTuples(async_w3, TUPLE_CONTRACT_DECODE_TUPLES):
+    return async_w3.eth.contract(**TUPLE_CONTRACT_DECODE_TUPLES)
+
+
 @pytest.fixture()
 def AsyncMathContract(async_w3, MATH_ABI, MATH_CODE, MATH_RUNTIME):
     return async_w3.eth.contract(

web3/_utils/abi.py

@@ -924,13 +924,17 @@ def named_tree(
 
 
 def named_subtree(
-    abi: Dict[str, Any], data: Tuple[Any, ...]
+    # TODO make this a better type
+    abi: Any,
+    data: Tuple[Any, ...],
 ) -> Union[Dict[str, Any], Tuple[Any, ...], Any]:
-    abi_type = parse(collapse_if_tuple(abi))
+    abi_type = parse(collapse_if_tuple(dict(abi)))
 
     if abi_type.is_array:
         item_type = abi_type.item_type.to_type_str()
         item_abi = {**abi, "type": item_type, "name": ""}
+        # cast(ABIFunctionParams, item_abi)
+        # breakpoint()
         items = [named_subtree(item_abi, item) for item in data]
         return items
 

web3/_utils/contracts.py

@@ -10,9 +10,6 @@
     cast,
 )
 
-from eth_abi import (
-    decode,
-)
 from eth_abi.codec import (
     ABICodec,
 )
@@ -50,7 +47,6 @@
     get_receive_func_abi,
     map_abi_data,
     merge_args_and_kwargs,
-    named_tree,
 )
 from web3._utils.blocks import (
     is_hex_encoded_block_hash,
@@ -317,15 +313,6 @@ def encode_transaction_data(
     return add_0x_prefix(encode_abi(w3, fn_abi, fn_arguments, fn_selector))
 
 
-def decode_transaction_data(fn_abi, data, normalizers=None):
-    data = HexBytes(data)
-    types = get_abi_input_types(fn_abi)
-    decoded = decode(types, data[4:])
-    if normalizers:
-        decoded = map_abi_data(normalizers, types, decoded)
-    return named_tree(fn_abi["inputs"], decoded)
-
-
 def get_fallback_function_info(
     contract_abi: Optional[ABI] = None, fn_abi: Optional[ABIFunction] = None
 ) -> Tuple[ABIFunction, HexStr, Tuple[Any, ...]]: