Test passing a tuple into a contract call

Author: feuGeneA

tests/core/contracts/conftest.py

@@ -527,6 +527,110 @@ def FallballFunctionContract(web3, FALLBACK_FUNCTION_CONTRACT):
     return web3.eth.contract(**FALLBACK_FUNCTION_CONTRACT)
 
 
+CONTRACT_TUPLE_SOURCE = """
+pragma experimental ABIEncoderV3;
+
+contract Tuple {
+    struct Struct {
+        int anInt;
+        bool aBool;
+        address anAddress;
+    }
+
+    function method(Struct memory m)
+        public
+        pure
+        returns (Struct memory)
+    {
+        return m;
+    }
+}"""
+
+CONTRACT_TUPLE_CODE = "608060405234801561001057600080fd5b506102ed806100206000396000f3fe608060405234801561001057600080fd5b5060043610610048576000357c0100000000000000000000000000000000000000000000000000000000900480634e3269761461004d575b600080fd5b61006760048036036100629190810190610163565b61007d565b60405161007491906101fb565b60405180910390f35b61008561008d565b819050919050565b60606040519081016040528060008152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b60006100d3823561028b565b905092915050565b60006100e7823561029d565b905092915050565b60006100fb82356102a9565b905092915050565b60006060828403121561011557600080fd5b61011f6060610216565b9050600061012f848285016100ef565b6000830152506020610143848285016100db565b6020830152506040610157848285016100c7565b60408301525092915050565b60006060828403121561017557600080fd5b600061018384828501610103565b91505092915050565b61019581610243565b82525050565b6101a481610255565b82525050565b6101b381610261565b82525050565b6060820160008201516101cf60008501826101aa565b5060208201516101e2602085018261019b565b5060408201516101f5604085018261018c565b50505050565b600060608201905061021060008301846101b9565b92915050565b6000604051905081810181811067ffffffffffffffff8211171561023957600080fd5b8060405250919050565b600061024e8261026b565b9050919050565b60008115159050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102968261026b565b9050919050565b60008115159050919050565b600081905091905056fea265627a7a723058203f779dc401e40b86d552e03af453e4f759bd8e4f8f0ca5ffb05909e2af7567b76c6578706572696d656e74616cf50037"  # noqa: E501
+
+CONTRACT_TUPLE_RUNTIME = "608060405234801561001057600080fd5b5060043610610048576000357c0100000000000000000000000000000000000000000000000000000000900480634e3269761461004d575b600080fd5b61006760048036036100629190810190610163565b61007d565b60405161007491906101fb565b60405180910390f35b61008561008d565b819050919050565b60606040519081016040528060008152602001600015158152602001600073ffffffffffffffffffffffffffffffffffffffff1681525090565b60006100d3823561028b565b905092915050565b60006100e7823561029d565b905092915050565b60006100fb82356102a9565b905092915050565b60006060828403121561011557600080fd5b61011f6060610216565b9050600061012f848285016100ef565b6000830152506020610143848285016100db565b6020830152506040610157848285016100c7565b60408301525092915050565b60006060828403121561017557600080fd5b600061018384828501610103565b91505092915050565b61019581610243565b82525050565b6101a481610255565b82525050565b6101b381610261565b82525050565b6060820160008201516101cf60008501826101aa565b5060208201516101e2602085018261019b565b5060408201516101f5604085018261018c565b50505050565b600060608201905061021060008301846101b9565b92915050565b6000604051905081810181811067ffffffffffffffff8211171561023957600080fd5b8060405250919050565b600061024e8261026b565b9050919050565b60008115159050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102968261026b565b9050919050565b60008115159050919050565b600081905091905056fea265627a7a723058203f779dc401e40b86d552e03af453e4f759bd8e4f8f0ca5ffb05909e2af7567b76c6578706572696d656e74616cf50037"  # noqa: E501
+
+CONTRACT_TUPLE_ABI = json.loads("""
+[
+    {
+        "constant": true,
+        "inputs": [
+            {
+                "components": [
+                    {
+                        "name": "anInt",
+                        "type": "int256"
+                    },
+                    {
+                        "name": "aBool",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "anAddress",
+                        "type": "address"
+                    }
+                ],
+                "name": "m",
+                "type": "tuple"
+            }
+        ],
+        "name": "method",
+        "outputs": [
+            {
+                "components": [
+                    {
+                        "name": "anInt",
+                        "type": "int256"
+                    },
+                    {
+                        "name": "aBool",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "anAddress",
+                        "type": "address"
+                    }
+                ],
+                "name": "",
+                "type": "tuple"
+            }
+        ],
+        "payable": false,
+        "stateMutability": "pure",
+        "type": "function"
+    }
+]""")
+
+
+@pytest.fixture()
+def TUPLE_CODE():
+    return CONTRACT_TUPLE_CODE
+
+
+@pytest.fixture()
+def TUPLE_RUNTIME():
+    return CONTRACT_TUPLE_RUNTIME
+
+
+@pytest.fixture()
+def TUPLE_ABI():
+    return CONTRACT_TUPLE_ABI
+
+
+@pytest.fixture()
+def TUPLE_CONTRACT(TUPLE_CODE, TUPLE_RUNTIME, TUPLE_ABI):
+    return {
+        'bytecode': TUPLE_CODE,
+        'bytecode_runtime': TUPLE_RUNTIME,
+        'abi': TUPLE_ABI,
+    }
+
+
+@pytest.fixture()
+def TupleContract(web3, TUPLE_CONTRACT):
+    return web3.eth.contract(**TUPLE_CONTRACT)
+
+
 class LogFunctions:
     LogAnonymous = 0
     LogNoArguments = 1

tests/core/contracts/test_contract_call_interface.py

@@ -134,6 +134,11 @@ def fallback_function_contract(web3, FallballFunctionContract, address_conversio
     return deploy(web3, FallballFunctionContract, address_conversion_func)
 
 
+@pytest.fixture()
+def tuple_contract(web3, TupleContract, address_conversion_func):
+    return deploy(web3, TupleContract, address_conversion_func)
+
+
 def test_invalid_address_in_deploy_arg(web3, WithConstructorAddressArgumentsContract):
     with pytest.raises(InvalidAddress):
         WithConstructorAddressArgumentsContract.constructor(
@@ -611,3 +616,21 @@ def test_invalid_fixed_value_reflections(web3, fixed_reflection_contract, functi
     contract_func = fixed_reflection_contract.functions[function]
     with pytest.raises(ValidationError, match=error):
         contract_func(value).call({'gas': 420000})
+
+
+@pytest.mark.parametrize(
+    'method_input, expected',
+    (
+        (
+            {'anInt': 0, 'aBool': True, 'anAddress': '0x' + 'f' * 40},
+            (0, True, '0x' + 'f' * 40)
+        ),
+        (
+            (0, True, '0x' + 'f' * 40),
+            (0, True, '0x' + 'f' * 40),
+        ),
+    )
+)
+def test_call_tuple_contract(tuple_contract, method_input, expected):
+    result = tuple_contract.functions.method(method_input).call()
+    assert result == expected