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

bug in abi. fixed external type for return parameters

Browse Source
This commit is contained in:
Liana Husikyan 2015-05-11 13:47:21 +02:00
parent 2cc62fbbfb
commit ccc3d56542
2 changed files with 69 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libsolidity/SolidityABIJSON.cpp
View File

@ -499,7 +499,8 @@ BOOST_AUTO_TEST_CASE(constructor_abi)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
contract test { contract test {
function test(uint param1, test param2, bool param3) {} enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
function test(uint param1, test param2, bool param3, ActionChoices param4) {}
} }
)"; )";
@ -517,6 +518,51 @@ BOOST_AUTO_TEST_CASE(constructor_abi)
{ {
"name": "param3", "name": "param3",
"type": "bool" "type": "bool"
},
{
"name": "param4",
"type": "uint8"
}
],
"type": "constructor"
}
])";
checkInterface(sourceCode, interface);
}
BOOST_AUTO_TEST_CASE(return_param_in_abi)
{
// bug #1801
char const* sourceCode = R"(
contract test {
enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
function test(ActionChoices param) {}
function ret() returns(ActionChoices){
ActionChoices action = ActionChoices.GoLeft;
return action;
}
}
)";
char const* interface = R"([
{
"constant" : false,
"inputs" : [],
"name" : "ret",
"outputs" : [
{
"name" : "",
"type" : "uint8"
}
],
"type" : "function"
},
{
"inputs": [
{
"name": "param",
"type": "uint8"
} }
], ],
"type": "constructor" "type": "constructor"

22
libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -508,6 +508,28 @@ BOOST_AUTO_TEST_CASE(function_external_types)
} }
} }
BOOST_AUTO_TEST_CASE(enum_external_type)
{
// bug #1801
ASTPointer<SourceUnit> sourceUnit;
char const* text = R"(
contract Test {
enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
function boo(ActionChoices enumArg) external returns (uint ret) {
ret = 5;
}
})";
ETH_TEST_REQUIRE_NO_THROW(sourceUnit = parseTextAndResolveNames(text), "Parsing and name Resolving failed");
for (ASTPointer<ASTNode> const& node: sourceUnit->getNodes())
if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
{
auto functions = contract->getDefinedFunctions();
if (functions.empty())
continue;
BOOST_CHECK_EQUAL("boo(uint8)", functions[0]->externalSignature());
}
}
BOOST_AUTO_TEST_CASE(function_external_call_allowed_conversion) BOOST_AUTO_TEST_CASE(function_external_call_allowed_conversion)
{ {
char const* text = R"( char const* text = R"(