diff options
author | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-16 05:47:26 +0800 |
---|---|---|
committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-17 00:23:08 +0800 |
commit | 93be0dd92309c711e7a29dac5257067b837eb7f8 (patch) | |
tree | d5ed6dbbbfd8a81bcaa464806d3e4f5c4a3eea30 /test | |
parent | 4449820be3b23cb074c8db77915a799b3ff31c49 (diff) | |
download | dexon-solidity-93be0dd92309c711e7a29dac5257067b837eb7f8.tar dexon-solidity-93be0dd92309c711e7a29dac5257067b837eb7f8.tar.gz dexon-solidity-93be0dd92309c711e7a29dac5257067b837eb7f8.tar.bz2 dexon-solidity-93be0dd92309c711e7a29dac5257067b837eb7f8.tar.lz dexon-solidity-93be0dd92309c711e7a29dac5257067b837eb7f8.tar.xz dexon-solidity-93be0dd92309c711e7a29dac5257067b837eb7f8.tar.zst dexon-solidity-93be0dd92309c711e7a29dac5257067b837eb7f8.zip |
FunctionType comparison/identifer to support all statemutability levels
Diffstat (limited to 'test')
-rw-r--r-- | test/libsolidity/ASTJSON.cpp | 2 | ||||
-rw-r--r-- | test/libsolidity/SolidityTypes.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/libsolidity/ASTJSON.cpp b/test/libsolidity/ASTJSON.cpp index 4fb4f20c..31165922 100644 --- a/test/libsolidity/ASTJSON.cpp +++ b/test/libsolidity/ASTJSON.cpp @@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE(function_type) Json::Value retval = fun["children"][1]["children"][0]; BOOST_CHECK_EQUAL(retval["name"], "VariableDeclaration"); BOOST_CHECK_EQUAL(retval["attributes"]["name"], ""); - BOOST_CHECK_EQUAL(retval["attributes"]["type"], "function () constant external returns (uint256)"); + BOOST_CHECK_EQUAL(retval["attributes"]["type"], "function () view external returns (uint256)"); funType = retval["children"][0]; BOOST_CHECK_EQUAL(funType["attributes"]["constant"], true); BOOST_CHECK_EQUAL(funType["attributes"]["payable"], false); diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp index 0b5ab516..9f385a04 100644 --- a/test/libsolidity/SolidityTypes.cpp +++ b/test/libsolidity/SolidityTypes.cpp @@ -129,10 +129,10 @@ BOOST_AUTO_TEST_CASE(type_identifiers) BOOST_CHECK_EQUAL(t.identifier(), "t_tuple$_t_type$_t_enum$_Enum_$4_$_$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$_t_array$_t_string_storage_$20_storage_ptr_$__$"); TypePointer sha3fun = make_shared<FunctionType>(strings{}, strings{}, FunctionType::Kind::SHA3); - BOOST_CHECK_EQUAL(sha3fun->identifier(), "t_function_sha3$__$returns$__$"); + BOOST_CHECK_EQUAL(sha3fun->identifier(), "t_function_sha3_nonpayable$__$returns$__$"); FunctionType metaFun(TypePointers{sha3fun}, TypePointers{s.type()}); - BOOST_CHECK_EQUAL(metaFun.identifier(), "t_function_internal$_t_function_sha3$__$returns$__$_$returns$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$"); + BOOST_CHECK_EQUAL(metaFun.identifier(), "t_function_internal_nonpayable$_t_function_sha3_nonpayable$__$returns$__$_$returns$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$"); TypePointer m = make_shared<MappingType>(Type::fromElementaryTypeName("bytes32"), s.type()); MappingType m2(Type::fromElementaryTypeName("uint64"), m); |