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

Enforce disallowing empty structs

Browse Source 
This patch enfoces an error when it encounters an empty struct,
effectively eliminating the deprecation warning.

Also adjust 419_interface_structs to explicitely test for (non-empty) structs,
as this behaviour "may" change in the future.
This commit is contained in:
Christian Parpart
2018-06-14 00:24:43 +01:00
committed by Alex Beregszaszi
parent 014bbc6c97
commit a211b89118
11 changed files with 26 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/libsolidity/ABIDecoderTests.cpp
-20
View File
@@ -659,26 +659,6 @@ BOOST_AUTO_TEST_CASE(struct_function)
)
}
BOOST_AUTO_TEST_CASE(empty_struct)
{
string sourceCode = R"(
contract C {
struct S { }
function f(uint a, S s, uint b) public pure returns (uint x, uint y) {
assembly { x := a y := b }
}
function g() public returns (uint, uint) {
return this.f(7, S(), 8);
}
}
)";
NEW_ENCODER(
compileAndRun(sourceCode, 0, "C");
ABI_CHECK(callContractFunction("f(uint256,(),uint256)", 7, 8), encodeArgs(7, 8));
ABI_CHECK(callContractFunction("g()"), encodeArgs(7, 8));
)
}
BOOST_AUTO_TEST_CASE(mediocre_struct)
{
string sourceCode = R"(
test/libsolidity/ABIEncoderTests.cpp
-22
View File
@@ -447,28 +447,6 @@ BOOST_AUTO_TEST_CASE(structs)
)
}
BOOST_AUTO_TEST_CASE(empty_struct)
{
string sourceCode = R"(
contract C {
struct S { }
S s;
event e(uint16, S, uint16);
function f() returns (uint, S, uint) {
e(7, s, 8);
return (7, s, 8);
}
}
)";
NEW_ENCODER(
compileAndRun(sourceCode, 0, "C");
bytes encoded = encodeArgs(7, 8);
BOOST_CHECK(callContractFunction("f()") == encoded);
REQUIRE_LOG_DATA(encoded);
)
}
BOOST_AUTO_TEST_CASE(structs2)
{
string sourceCode = R"(
test/libsolidity/SolidityEndToEndTest.cpp
-3
View File
@@ -1271,7 +1271,6 @@ BOOST_AUTO_TEST_CASE(deleteStruct)
contract test {
struct topStruct {
nestedStruct nstr;
emptyStruct empty;
uint topValue;
mapping (uint => uint) topMapping;
}
@@ -1281,8 +1280,6 @@ BOOST_AUTO_TEST_CASE(deleteStruct)
uint nestedValue;
mapping (uint => bool) nestedMapping;
}
struct emptyStruct{
}
function test(){
toDelete = 5;
str.topValue = 1;
test/libsolidity/SolidityNameAndTypeResolution.cpp
+10 -10
View File
@@ -203,10 +203,10 @@ BOOST_AUTO_TEST_CASE(external_structs)
pragma experimental ABIEncoderV2;
contract Test {
enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
struct Empty {}
struct Simple { uint i; }
struct Nested { X[2][] a; uint y; }
struct X { bytes32 x; Test t; Empty[] e; }
function f(ActionChoices, uint, Empty) external {}
struct X { bytes32 x; Test t; Simple[] s; }
function f(ActionChoices, uint, Simple) external {}
function g(Test, Nested) external {}
function h(function(Nested) external returns (uint)[]) external {}
function i(Nested[]) external {}
@@ -218,10 +218,10 @@ BOOST_AUTO_TEST_CASE(external_structs)
{
auto functions = contract->definedFunctions();
BOOST_REQUIRE(!functions.empty());
BOOST_CHECK_EQUAL("f(uint8,uint256,())", functions[0]->externalSignature());
BOOST_CHECK_EQUAL("g(address,((bytes32,address,()[])[2][],uint256))", functions[1]->externalSignature());
BOOST_CHECK_EQUAL("f(uint8,uint256,(uint256))", functions[0]->externalSignature());
BOOST_CHECK_EQUAL("g(address,((bytes32,address,(uint256)[])[2][],uint256))", functions[1]->externalSignature());
BOOST_CHECK_EQUAL("h(function[])", functions[2]->externalSignature());
BOOST_CHECK_EQUAL("i(((bytes32,address,()[])[2][],uint256)[])", functions[3]->externalSignature());
BOOST_CHECK_EQUAL("i(((bytes32,address,(uint256)[])[2][],uint256)[])", functions[3]->externalSignature());
}
}
@@ -231,10 +231,10 @@ BOOST_AUTO_TEST_CASE(external_structs_in_libraries)
pragma experimental ABIEncoderV2;
library Test {
enum ActionChoices { GoLeft, GoRight, GoStraight, Sit }
struct Empty {}
struct Simple { uint i; }
struct Nested { X[2][] a; uint y; }
struct X { bytes32 x; Test t; Empty[] e; }
function f(ActionChoices, uint, Empty) external {}
struct X { bytes32 x; Test t; Simple[] s; }
function f(ActionChoices, uint, Simple) external {}
function g(Test, Nested) external {}
function h(function(Nested) external returns (uint)[]) external {}
function i(Nested[]) external {}
@@ -246,7 +246,7 @@ BOOST_AUTO_TEST_CASE(external_structs_in_libraries)
{
auto functions = contract->definedFunctions();
BOOST_REQUIRE(!functions.empty());
BOOST_CHECK_EQUAL("f(Test.ActionChoices,uint256,Test.Empty)", functions[0]->externalSignature());
BOOST_CHECK_EQUAL("f(Test.ActionChoices,uint256,Test.Simple)", functions[0]->externalSignature());
BOOST_CHECK_EQUAL("g(Test,Test.Nested)", functions[1]->externalSignature());
BOOST_CHECK_EQUAL("h(function[])", functions[2]->externalSignature());
BOOST_CHECK_EQUAL("i(Test.Nested[])", functions[3]->externalSignature());
test/libsolidity/syntaxTests/empty_struct.sol
+1 -1
View File
@@ -2,4 +2,4 @@ contract test {
struct A {}
}
// ----
// Warning: (17-28): Defining empty structs is deprecated.
// SyntaxError: (17-28): Defining empty structs is disallowed.
test/libsolidity/syntaxTests/empty_struct_050.sol
-6
View File
@@ -1,6 +0,0 @@
pragma experimental "v0.5.0";
contract test {
struct A {}
}
// ----
// SyntaxError: (47-58): Defining empty structs is disallowed.
test/libsolidity/syntaxTests/nameAndTypeResolution/039_functions_with_identical_structs_in_interface.sol
+3 -5
View File
@@ -1,13 +1,11 @@
pragma experimental ABIEncoderV2;
contract C {
struct S1 { }
struct S2 { }
struct S1 { int i; }
struct S2 { int i; }
function f(S1) pure {}
function f(S2) pure {}
}
// ----
// Warning: (0-33): Experimental features are turned on. Do not use experimental features on live deployments.
// Warning: (52-65): Defining empty structs is deprecated.
// Warning: (70-83): Defining empty structs is deprecated.
// TypeError: (115-137): Function overload clash during conversion to external types for arguments.
// TypeError: (129-151): Function overload clash during conversion to external types for arguments.
test/libsolidity/syntaxTests/nameAndTypeResolution/419_interface_structs.sol
+4 -2
View File
@@ -1,7 +1,9 @@
interface I {
struct A {
// This is currently expected to break, but it *may* change in the future.
int dummy;
}
}
// ----
// Warning: (18-34): Defining empty structs is deprecated.
// TypeError: (18-34): Structs cannot be defined in interfaces.
// TypeError: (18-136): Structs cannot be defined in interfaces.
// TypeError: (120-129): Variables cannot be declared in interfaces.
test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol
+5 -6
View File
@@ -1,7 +1,7 @@
contract C {
struct S { uint x; }
S s;
struct T { }
struct T { uint y; }
T t;
enum A { X, Y }
function f() public pure {
@@ -9,9 +9,8 @@ contract C {
}
}
// ----
// Warning: (51-63): Defining empty structs is deprecated.
// TypeError: (168-169): This type cannot be encoded.
// TypeError: (171-172): This type cannot be encoded.
// TypeError: (176-177): This type cannot be encoded.
// TypeError: (179-180): This type cannot be encoded.
// TypeError: (182-186): This type cannot be encoded.
// TypeError: (188-194): This type cannot be encoded.
// TypeError: (187-188): This type cannot be encoded.
// TypeError: (190-194): This type cannot be encoded.
// TypeError: (196-202): This type cannot be encoded.