cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix interface type conversion internal to structs.

Browse Source
This commit is contained in:
chriseth
2017-09-16 12:12:43 +01:00
committed by Alex Beregszaszi
parent 823e67bf40
commit 36a90289e6
4 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/SolidityABIJSON.cpp
+36
View File
@@ -980,6 +980,42 @@ BOOST_AUTO_TEST_CASE(return_structs)
checkInterface(text, interface);
}
BOOST_AUTO_TEST_CASE(return_structs_with_contracts)
{
char const* text = R"(
contract C {
struct S { C[] x; C y; }
function f() returns (S s, C c) {
}
}
)";
char const* interface = R"(
[
{
"constant" : false,
"payable": false,
"inputs": [],
"name": "f",
"outputs" : [{
"name" : "s",
"type" : [{
"name" : "x",
"type" : "address[]"
}, {
"name" : "y",
"type" : "address"
}]
}, {
"name" : "c",
"type" : "address"
}],
"type" : "function"
}
]
)";
checkInterface(text, interface);
}
BOOST_AUTO_TEST_CASE(event_structs)
{
char const* text = R"(
test/libsolidity/SolidityNameAndTypeResolution.cpp
+2 -4
View File
@@ -609,7 +609,7 @@ BOOST_AUTO_TEST_CASE(external_structs)
struct Nested { X[2][] a; mapping(uint => uint) m; uint y; }
struct X { bytes32 x; Test t; Empty[] e; }
function f(ActionChoices, uint, Empty) external {}
function g(Nested) external {}
function g(Test, Nested) external {}
function h(function(Nested) external returns (uint)[]) external {}
function i(Nested[]) external {}
}
@@ -620,10 +620,8 @@ BOOST_AUTO_TEST_CASE(external_structs)
{
auto functions = contract->definedFunctions();
BOOST_REQUIRE(!functions.empty());
for (auto const& f: functions)
cout << f->externalSignature() << endl;
BOOST_CHECK_EQUAL("f(uint8,uint256,())", functions[0]->externalSignature());
BOOST_CHECK_EQUAL("g(((bytes32,address,()[])[2][],uint256))", functions[1]->externalSignature());
BOOST_CHECK_EQUAL("g(address,((bytes32,address,()[])[2][],uint256))", functions[1]->externalSignature());
BOOST_CHECK_EQUAL("h(function[])", functions[2]->externalSignature());
BOOST_CHECK_EQUAL("i(((bytes32,address,()[])[2][],uint256)[])", functions[3]->externalSignature());
}