diff options
| author | chriseth <chris@ethereum.org> | 2017-08-24 21:08:31 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-09-16 19:31:12 +0800 |
| commit | 6385641f6e461a1964da793956fbe0ef8cddadd3 (patch) | |
| tree | 249b9de69b5c799bbe35032ff6820780ea790a58 /test | |
| parent | 44825d1c1ecef6ea3fa27da6330c12dcf4279fb3 (diff) | |
| download | dexon-solidity-6385641f6e461a1964da793956fbe0ef8cddadd3.tar dexon-solidity-6385641f6e461a1964da793956fbe0ef8cddadd3.tar.gz dexon-solidity-6385641f6e461a1964da793956fbe0ef8cddadd3.tar.bz2 dexon-solidity-6385641f6e461a1964da793956fbe0ef8cddadd3.tar.lz dexon-solidity-6385641f6e461a1964da793956fbe0ef8cddadd3.tar.xz dexon-solidity-6385641f6e461a1964da793956fbe0ef8cddadd3.tar.zst dexon-solidity-6385641f6e461a1964da793956fbe0ef8cddadd3.zip | |
Fix tests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/libsolidity/SolidityABIJSON.cpp | 4 | ||||
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 1 | ||||
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 8 |
3 files changed, 9 insertions, 4 deletions
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index 5ddd28ad..e4ab54ec 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -981,6 +981,7 @@ BOOST_AUTO_TEST_CASE(return_structs) } ], "payable" : false, + "stateMutability" : "nonpayable", "type" : "function" }] )"; @@ -1022,6 +1023,7 @@ BOOST_AUTO_TEST_CASE(return_structs_with_contracts) } ], "payable": false, + "stateMutability" : "nonpayable", "type": "function" }] )"; @@ -1127,6 +1129,7 @@ BOOST_AUTO_TEST_CASE(structs_in_libraries) "name": "g", "outputs": [], "payable": false, + "stateMutability": "nonpayable", "type": "function" }, { @@ -1140,6 +1143,7 @@ BOOST_AUTO_TEST_CASE(structs_in_libraries) "name": "f", "outputs": [], "payable": false, + "stateMutability": "nonpayable", "type": "function" }] )"; diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 393d3c64..2bdcbd48 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -9685,6 +9685,7 @@ BOOST_AUTO_TEST_CASE(contracts_separated_with_comment) BOOST_AUTO_TEST_CASE(return_structs) { char const* sourceCode = R"( + pragma experimental ABIEncoderV2; contract C { struct S { uint a; T[] sub; } struct T { uint[2] x; } diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index dcab8fb0..778c12c5 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -1102,7 +1102,7 @@ BOOST_AUTO_TEST_CASE(struct_accessor_one_array_only) Data public data; } )"; - CHECK_ERROR(sourceCode, TypeError, "Internal type is not allowed for public state variables."); + CHECK_ERROR(sourceCode, TypeError, "Internal or recursive type is not allowed for public state variables."); } BOOST_AUTO_TEST_CASE(base_class_state_variable_internal_member) @@ -4904,7 +4904,7 @@ BOOST_AUTO_TEST_CASE(internal_function_as_external_parameter) } } )"; - CHECK_ERROR(text, TypeError, "Internal type is not allowed for public or external functions."); + CHECK_ERROR(text, TypeError, "Internal or recursive type is not allowed for public or external functions."); } BOOST_AUTO_TEST_CASE(internal_function_returned_from_public_function) @@ -4916,7 +4916,7 @@ BOOST_AUTO_TEST_CASE(internal_function_returned_from_public_function) } } )"; - CHECK_ERROR(text, TypeError, "Internal type is not allowed for public or external functions."); + CHECK_ERROR(text, TypeError, "Internal or recursive type is not allowed for public or external functions."); } BOOST_AUTO_TEST_CASE(internal_function_as_external_parameter_in_library_internal) @@ -4938,7 +4938,7 @@ BOOST_AUTO_TEST_CASE(internal_function_as_external_parameter_in_library_external } } )"; - CHECK_ERROR(text, TypeError, "Internal type is not allowed for public or external functions."); + CHECK_ERROR(text, TypeError, "Internal or recursive type is not allowed for public or external functions."); } BOOST_AUTO_TEST_CASE(function_type_arrays) |