cerc-io/solidity
16
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

Structure type json using "components".

Browse Source
This commit is contained in:
chriseth 2017-06-30 10:22:35 +02:00 committed by Alex Beregszaszi
parent 36a90289e6
commit 7e1b9c1652
2 changed files with 151 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libsolidity/interface/ABI.cpp
View File

@ -136,25 +136,25 @@ Json::Value ABI::formatType(string const& _name, Type const& _type, bool _forLib
suffix = string("[") + arrayType->length().str() + "]"; suffix = string("[") + arrayType->length().str() + "]";
solAssert(arrayType->baseType(), ""); solAssert(arrayType->baseType(), "");
Json::Value subtype = formatType("", *arrayType->baseType(), _forLibrary); Json::Value subtype = formatType("", *arrayType->baseType(), _forLibrary);
if (subtype["type"].isString() && !subtype.isMember("subtype")) if (subtype.isMember("components"))
ret["type"] = subtype["type"].asString() + suffix;
else
{ {
ret["type"] = suffix; ret["type"] = subtype["type"].asString() + suffix;
solAssert(!subtype.isMember("subtype"), ""); ret["components"] = subtype["components"];
ret["subtype"] = subtype["type"];
} }
else
ret["type"] = subtype["type"].asString() + suffix;
} }
} }
else if (StructType const* structType = dynamic_cast<StructType const*>(&_type)) else if (StructType const* structType = dynamic_cast<StructType const*>(&_type))
{ {
ret["type"] = Json::arrayValue; ret["type"] = string();
ret["components"] = Json::arrayValue;
for (auto const& member: structType->members(nullptr)) for (auto const& member: structType->members(nullptr))
{ {
solAssert(member.type, ""); solAssert(member.type, "");
auto t = member.type->interfaceType(_forLibrary); auto t = member.type->interfaceType(_forLibrary);
solAssert(t, ""); solAssert(t, "");
ret["type"].append(formatType(member.name, *t, _forLibrary)); ret["components"].append(formatType(member.name, *t, _forLibrary));
} }
} }
else else

249
test/libsolidity/SolidityABIJSON.cpp
View File

@ -950,32 +950,39 @@ BOOST_AUTO_TEST_CASE(return_structs)
} }
)"; )";
char const* interface = R"( char const* interface = R"(
[ [{
{
"constant" : false, "constant" : false,
"payable": false, "inputs" : [],
"inputs": [], "name" : "f",
"name": "f", "outputs" : [
"outputs": [{ {
"name": "x", "name" : "x",
"type": "uint256" "type" : "uint256"
}, { },
"name": "s", {
"type": [{ "components" : [
"name": "a", {
"type": "uint256" "name" : "a",
}, { "type" : "uint256"
"name": "sub", },
"subtype": [{ {
"name": "x", "components" : [
"type": "uint256[2]" {
}], "name" : "x",
"type": "[]" "type" : "uint256[2]"
}] }
}], ],
"name" : "sub",
"type" : "[]"
}
],
"name" : "s",
"type" : ""
}
],
"payable" : false,
"type" : "function" "type" : "function"
} }]
]
)"; )";
checkInterface(text, interface); checkInterface(text, interface);
} }
@ -990,28 +997,33 @@ BOOST_AUTO_TEST_CASE(return_structs_with_contracts)
} }
)"; )";
char const* interface = R"( char const* interface = R"(
[ [{
{ "constant": false,
"constant" : false,
"payable": false,
"inputs": [], "inputs": [],
"name": "f", "name": "f",
"outputs" : [{ "outputs": [
"name" : "s", {
"type" : [{ "components": [
"name" : "x", {
"type" : "address[]" "name": "x",
}, { "type": "address[]"
"name" : "y", },
"type" : "address" {
}] "name": "y",
}, { "type": "address"
"name" : "c", }
"type" : "address" ],
}], "name": "s",
"type" : "function" "type": ""
} },
] {
"name": "c",
"type": "address"
}
],
"payable": false,
"type": "function"
}]
)"; )";
checkInterface(text, interface); checkInterface(text, interface);
} }
@ -1025,36 +1037,49 @@ BOOST_AUTO_TEST_CASE(event_structs)
event E(T t, S s); event E(T t, S s);
} }
)"; )";
char const* interface = R"( char const *interface = R"(
[{ [{
"anonymous" : false, "anonymous": false,
"inputs" : [{ "inputs": [
"indexed" : false, {
"name" : "t", "components": [
"type" : [{ {
"name" : "x", "name": "x",
"type" : "uint256[2]" "type": "uint256[2]"
}] }
}, { ],
"indexed" : false, "indexed": false,
"name" : "s", "name": "t",
"type" : [{ "type": ""
"name" : "a", },
"type" : "uint256" {
}, { "components": [
"name" : "sub", {
"subtype" : [{ "name": "a",
"name" : "x", "type": "uint256"
"type" : "uint256[2]" },
}], {
"type" : "[]" "components": [
}, { {
"name" : "b", "name": "x",
"type" : "bytes" "type": "uint256[2]"
}] }
}], ],
"name" : "E", "name": "sub",
"type" : "event" "type": "[]"
},
{
"name": "b",
"type": "bytes"
}
],
"indexed": false,
"name": "s",
"type": ""
}
],
"name": "E",
"type": "event"
}] }]
)"; )";
checkInterface(text, interface); checkInterface(text, interface);
@ -1072,38 +1097,50 @@ BOOST_AUTO_TEST_CASE(structs_in_libraries)
)"; )";
char const* interface = R"( char const* interface = R"(
[{ [{
"constant" : false, "constant": false,
"inputs" : [{ "inputs": [
"name" : "s", {
"type" : [{ "components": [
"name" : "a", {
"type" : "uint256" "name": "a",
}, { "type": "uint256"
"name" : "sub", },
"subtype" : [{ {
"name" : "x", "components": [
"type" : "uint256[2]" {
}], "name": "x",
"type" : "[]" "type": "uint256[2]"
}, { }
"name" : "b", ],
"type" : "bytes" "name": "sub",
}] "type": "[]"
}], },
"name" : "g", {
"outputs" : [], "name": "b",
"payable" : false, "type": "bytes"
"type" : "function" }
}, { ],
"constant" : false, "name": "s",
"inputs" : [{ "type": ""
"name" : "s", }
"type" : "L.S storage" ],
}], "name": "g",
"name" : "f", "outputs": [],
"outputs" : [], "payable": false,
"payable" : false, "type": "function"
"type" : "function" },
{
"constant": false,
"inputs": [
{
"name": "s",
"type": "L.S storage"
}
],
"name": "f",
"outputs": [],
"payable": false,
"type": "function"
}] }]
)"; )";
checkInterface(text, interface); checkInterface(text, interface);