From 20c6cea7bb803a5217f6b96062c7bce150ba2b73 Mon Sep 17 00:00:00 2001 From: Leonardo Alt Date: Wed, 1 Aug 2018 19:01:50 +0200 Subject: Disallow structs in events without ABIEncoderV2 --- test/libsolidity/SolidityABIJSON.cpp | 1 + test/libsolidity/syntaxTests/emit/emit_empty.sol | 7 +++++++ test/libsolidity/syntaxTests/emit/emit_non_event.sol | 10 ++++++++++ test/libsolidity/syntaxTests/emit_empty.sol | 7 ------- test/libsolidity/syntaxTests/emit_non_event.sol | 10 ---------- test/libsolidity/syntaxTests/events/event_nested_array.sol | 5 +++++ test/libsolidity/syntaxTests/events/event_nested_array_2.sol | 4 ++++ .../syntaxTests/events/event_nested_array_in_struct.sol | 6 ++++++ test/libsolidity/syntaxTests/events/event_struct.sol | 6 ++++++ test/libsolidity/syntaxTests/events/event_struct_indexed.sol | 6 ++++++ 10 files changed, 45 insertions(+), 17 deletions(-) create mode 100644 test/libsolidity/syntaxTests/emit/emit_empty.sol create mode 100644 test/libsolidity/syntaxTests/emit/emit_non_event.sol delete mode 100644 test/libsolidity/syntaxTests/emit_empty.sol delete mode 100644 test/libsolidity/syntaxTests/emit_non_event.sol create mode 100644 test/libsolidity/syntaxTests/events/event_nested_array.sol create mode 100644 test/libsolidity/syntaxTests/events/event_nested_array_2.sol create mode 100644 test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol create mode 100644 test/libsolidity/syntaxTests/events/event_struct.sol create mode 100644 test/libsolidity/syntaxTests/events/event_struct_indexed.sol (limited to 'test/libsolidity') diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index f2d6d66f..0b2e23e6 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -980,6 +980,7 @@ BOOST_AUTO_TEST_CASE(return_structs_with_contracts) BOOST_AUTO_TEST_CASE(event_structs) { char const* text = R"( + pragma experimental ABIEncoderV2; contract C { struct S { uint a; T[] sub; bytes b; } struct T { uint[2] x; } diff --git a/test/libsolidity/syntaxTests/emit/emit_empty.sol b/test/libsolidity/syntaxTests/emit/emit_empty.sol new file mode 100644 index 00000000..819d88fe --- /dev/null +++ b/test/libsolidity/syntaxTests/emit/emit_empty.sol @@ -0,0 +1,7 @@ +contract C { + function f() public { + emit; + } +} +// ---- +// ParserError: (45-46): Expected event name or path. diff --git a/test/libsolidity/syntaxTests/emit/emit_non_event.sol b/test/libsolidity/syntaxTests/emit/emit_non_event.sol new file mode 100644 index 00000000..d5045ddf --- /dev/null +++ b/test/libsolidity/syntaxTests/emit/emit_non_event.sol @@ -0,0 +1,10 @@ +contract C { + uint256 Test; + + function f() public { + emit Test(); + } +} +// ---- +// TypeError: (63-69): Type is not callable +// TypeError: (63-67): Expression has to be an event invocation. diff --git a/test/libsolidity/syntaxTests/emit_empty.sol b/test/libsolidity/syntaxTests/emit_empty.sol deleted file mode 100644 index 819d88fe..00000000 --- a/test/libsolidity/syntaxTests/emit_empty.sol +++ /dev/null @@ -1,7 +0,0 @@ -contract C { - function f() public { - emit; - } -} -// ---- -// ParserError: (45-46): Expected event name or path. diff --git a/test/libsolidity/syntaxTests/emit_non_event.sol b/test/libsolidity/syntaxTests/emit_non_event.sol deleted file mode 100644 index d5045ddf..00000000 --- a/test/libsolidity/syntaxTests/emit_non_event.sol +++ /dev/null @@ -1,10 +0,0 @@ -contract C { - uint256 Test; - - function f() public { - emit Test(); - } -} -// ---- -// TypeError: (63-69): Type is not callable -// TypeError: (63-67): Expression has to be an event invocation. diff --git a/test/libsolidity/syntaxTests/events/event_nested_array.sol b/test/libsolidity/syntaxTests/events/event_nested_array.sol new file mode 100644 index 00000000..70af63b6 --- /dev/null +++ b/test/libsolidity/syntaxTests/events/event_nested_array.sol @@ -0,0 +1,5 @@ +contract c { + event E(uint[][]); +} +// ---- +// TypeError: (25-33): This type is only supported in the new experimental ABI encoder. Use "pragma experimental ABIEncoderV2;" to enable the feature. diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_2.sol b/test/libsolidity/syntaxTests/events/event_nested_array_2.sol new file mode 100644 index 00000000..5825650e --- /dev/null +++ b/test/libsolidity/syntaxTests/events/event_nested_array_2.sol @@ -0,0 +1,4 @@ +contract c { + event E(uint[2][]); +} +// ---- diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol b/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol new file mode 100644 index 00000000..fd59e962 --- /dev/null +++ b/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol @@ -0,0 +1,6 @@ +contract c { + struct S { uint x; uint[][] arr; } + event E(S); +} +// ---- +// TypeError: (61-62): This type is only supported in the new experimental ABI encoder. Use "pragma experimental ABIEncoderV2;" to enable the feature. diff --git a/test/libsolidity/syntaxTests/events/event_struct.sol b/test/libsolidity/syntaxTests/events/event_struct.sol new file mode 100644 index 00000000..c955dc5e --- /dev/null +++ b/test/libsolidity/syntaxTests/events/event_struct.sol @@ -0,0 +1,6 @@ +contract c { + struct S { uint a ; } + event E(S); +} +// ---- +// TypeError: (51-52): This type is only supported in the new experimental ABI encoder. Use "pragma experimental ABIEncoderV2;" to enable the feature. diff --git a/test/libsolidity/syntaxTests/events/event_struct_indexed.sol b/test/libsolidity/syntaxTests/events/event_struct_indexed.sol new file mode 100644 index 00000000..69ee5017 --- /dev/null +++ b/test/libsolidity/syntaxTests/events/event_struct_indexed.sol @@ -0,0 +1,6 @@ +contract c { + struct S { uint a ; } + event E(S indexed); +} +// ---- +// TypeError: (51-52): This type is only supported in the new experimental ABI encoder. Use "pragma experimental ABIEncoderV2;" to enable the feature. -- cgit