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

Update tests.

Browse Source
This commit is contained in:
chriseth 2019-04-02 16:44:43 +02:00
parent 43008dd08e
commit 3282c72a21
4 changed files with 118 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/cmdlineTests/gas_test_abiv2/output
View File

@ -2,11 +2,11 @@
======= gas_test_abiv2/input.sol:C ======= ======= gas_test_abiv2/input.sol:C =======
Gas estimation: Gas estimation:
construction: construction:
1140 + 1096600 = 1097740 1160 + 1115800 = 1116960
external: external:
a(): 530 a(): 530
b(uint256): 1118 b(uint256): infinite
f1(uint256): 586 f1(uint256): infinite
f2(uint256[],string[],uint16,address): infinite f2(uint256[],string[],uint16,address): infinite
f3(uint16[],string[],uint16,address): infinite f3(uint16[],string[],uint16,address): infinite
f4(uint32[],string[12],bytes[2][],address): infinite f4(uint32[],string[12],bytes[2][],address): infinite

2
test/cmdlineTests/gas_test_abiv2_optimize_yul/output
View File

@ -2,7 +2,7 @@
======= gas_test_abiv2_optimize_yul/input.sol:C ======= ======= gas_test_abiv2_optimize_yul/input.sol:C =======
Gas estimation: Gas estimation:
construction: construction:
651 + 617200 = 617851 651 + 616600 = 617251
external: external:
a(): 429 a(): 429
b(uint256): 884 b(uint256): 884

120
test/libsolidity/ABIDecoderTests.cpp
View File

@ -108,6 +108,7 @@ BOOST_AUTO_TEST_CASE(cleanup)
} }
} }
)"; )";
bool newDecoder = false;
BOTH_ENCODERS( BOTH_ENCODERS(
compileAndRun(sourceCode); compileAndRun(sourceCode);
ABI_CHECK( ABI_CHECK(
@ -119,8 +120,44 @@ BOOST_AUTO_TEST_CASE(cleanup)
"f(uint16,int16,address,bytes3,bool)", "f(uint16,int16,address,bytes3,bool)",
u256(0xffffff), u256(0x1ffff), u256(-1), string("abcd"), u256(1) u256(0xffffff), u256(0x1ffff), u256(-1), string("abcd"), u256(1)
), ),
encodeArgs(u256(0xffff), u256(-1), (u256(1) << 160) - 1, string("abc"), true) newDecoder ? bytes{} : encodeArgs(u256(0xffff), u256(-1), (u256(1) << 160) - 1, string("abc"), true)
); );
ABI_CHECK(
callContractFunction(
"f(uint16,int16,address,bytes3,bool)",
u256(0xffffff), u256(0), u256(0), string("bcd"), u256(1)
),
newDecoder ? bytes{} : encodeArgs(u256(0xffff), u256(0), 0, string("bcd"), true)
);
ABI_CHECK(
callContractFunction(
"f(uint16,int16,address,bytes3,bool)",
u256(0), u256(0x1ffff), u256(0), string("ab"), u256(1)
),
newDecoder ? bytes{} : encodeArgs(u256(0), u256(-1), 0, string("ab"), true)
);
ABI_CHECK(
callContractFunction(
"f(uint16,int16,address,bytes3,bool)",
u256(0), u256(0), u256(-1), string("ad"), u256(1)
),
newDecoder ? bytes{} : encodeArgs(u256(0), u256(0), (u256(1) << 160) - 1, string("ad"), true)
);
ABI_CHECK(
callContractFunction(
"f(uint16,int16,address,bytes3,bool)",
u256(0), u256(0), u256(0), string("abcd"), u256(1)
),
newDecoder ? bytes{} : encodeArgs(u256(0), u256(0), 0, string("abc"), true)
);
ABI_CHECK(
callContractFunction(
"f(uint16,int16,address,bytes3,bool)",
u256(0), u256(0), u256(0), string("abc"), u256(2)
),
newDecoder ? bytes{} : encodeArgs(u256(0), u256(0), 0, string("abc"), true)
);
newDecoder = true;
) )
} }
@ -506,7 +543,7 @@ BOOST_AUTO_TEST_CASE(short_input_bytes)
) )
} }
BOOST_AUTO_TEST_CASE(cleanup_int_inside_arrays) BOOST_AUTO_TEST_CASE(validation_int_inside_arrays)
{ {
string sourceCode = R"( string sourceCode = R"(
contract C { contract C {
@ -521,15 +558,69 @@ BOOST_AUTO_TEST_CASE(cleanup_int_inside_arrays)
ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, 7), encodeArgs(7)); ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, 7), encodeArgs(7));
ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, 7), encodeArgs(7)); ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, 7), encodeArgs(7));
ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, u256("0xffff")), encodeArgs(u256("0xffff"))); ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, u256("0xffff")), encodeArgs(u256("0xffff")));
ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, u256("0xffff")), encodeArgs(u256(-1))); ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, u256("0xffff")), encodeArgs());
ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, u256("0x1ffff")), encodeArgs(u256("0xffff"))); ABI_CHECK(callContractFunction("f(uint16[])", 0x20, 1, u256("0x1ffff")), encodeArgs());
ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, u256("0x10fff")), encodeArgs(u256("0x0fff"))); ABI_CHECK(callContractFunction("g(int16[])", 0x20, 1, u256("0x10fff")), encodeArgs());
ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 0), encodeArgs(u256(0))); ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 0), encodeArgs(u256(0)));
ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 1), encodeArgs(u256(1))); ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 1), encodeArgs(u256(1)));
ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 2), encodeArgs()); ABI_CHECK(callContractFunction("h(uint8[])", 0x20, 1, 2), encodeArgs());
) )
} }
BOOST_AUTO_TEST_CASE(validation_function_type)
{
string sourceCode = R"(
contract C {
function f(function () external) public pure returns (uint r) { r = 1; }
function g(function () external[] memory) public pure returns (uint r) { r = 2; }
function h(function () external[] calldata) external pure returns (uint r) { r = 3; }
function i(function () external[] calldata a) external pure returns (uint r) { a[0]; r = 4; }
}
)";
bool newDecoder = false;
string validFun{"01234567890123456789abcd"};
string invalidFun{"01234567890123456789abcdX"};
BOTH_ENCODERS(
compileAndRun(sourceCode);
ABI_CHECK(callContractFunction("f(function)", validFun), encodeArgs(1));
ABI_CHECK(callContractFunction("f(function)", invalidFun), newDecoder ? bytes{} : encodeArgs(1));
ABI_CHECK(callContractFunction("g(function[])", 0x20, 1, validFun), encodeArgs(2));
ABI_CHECK(callContractFunction("g(function[])", 0x20, 1, invalidFun), newDecoder ? bytes{} : encodeArgs(2));
ABI_CHECK(callContractFunction("h(function[])", 0x20, 1, validFun), encodeArgs(3));
// No failure because the data is not accessed.
ABI_CHECK(callContractFunction("h(function[])", 0x20, 1, invalidFun), encodeArgs(3));
ABI_CHECK(callContractFunction("i(function[])", 0x20, 1, validFun), encodeArgs(4));
ABI_CHECK(callContractFunction("i(function[])", 0x20, 1, invalidFun), newDecoder ? bytes{} : encodeArgs(4));
newDecoder = true;
)
}
BOOST_AUTO_TEST_CASE(validation_function_type_inside_struct)
{
string sourceCode = R"(
contract C {
struct S { function () external x; }
function f(S memory) public pure returns (uint r) { r = 1; }
function g(S calldata) external pure returns (uint r) { r = 2; }
function h(S calldata s) external pure returns (uint r) { s.x; r = 3; }
}
)";
string validFun{"01234567890123456789abcd"};
string invalidFun{"01234567890123456789abcdX"};
NEW_ENCODER(
compileAndRun(sourceCode);
ABI_CHECK(callContractFunction("f((function))", validFun), encodeArgs(1));
// Error because we copy to memory
ABI_CHECK(callContractFunction("f((function))", invalidFun), encodeArgs());
ABI_CHECK(callContractFunction("g((function))", validFun), encodeArgs(2));
// No error because x is not accessed.
ABI_CHECK(callContractFunction("g((function))", invalidFun), encodeArgs(2));
ABI_CHECK(callContractFunction("h((function))", validFun), encodeArgs(3));
// Error on access.
ABI_CHECK(callContractFunction("h((function))", invalidFun), encodeArgs());
)
}
BOOST_AUTO_TEST_CASE(storage_ptr) BOOST_AUTO_TEST_CASE(storage_ptr)
{ {
string sourceCode = R"( string sourceCode = R"(
@ -583,7 +674,7 @@ BOOST_AUTO_TEST_CASE(struct_simple)
) )
} }
BOOST_AUTO_TEST_CASE(struct_cleanup) BOOST_AUTO_TEST_CASE(struct_validation)
{ {
string sourceCode = R"( string sourceCode = R"(
contract C { contract C {
@ -597,11 +688,24 @@ BOOST_AUTO_TEST_CASE(struct_cleanup)
} }
} }
)"; )";
u256 largeNeg("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01");
NEW_ENCODER( NEW_ENCODER(
compileAndRun(sourceCode, 0, "C"); compileAndRun(sourceCode, 0, "C");
ABI_CHECK( ABI_CHECK(
callContractFunction("f((int16,uint8,bytes2))", 0xff010, 0xff0002, "abcd"), callContractFunction("f((int16,uint8,bytes2))", largeNeg, 0xff, "ab"),
encodeArgs(u256("0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff010"), 2, "ab") encodeArgs(largeNeg, 0xff, "ab")
);
ABI_CHECK(
callContractFunction("f((int16,uint8,bytes2))", 0xff010, 0xff, "ab"),
encodeArgs()
);
ABI_CHECK(
callContractFunction("f((int16,uint8,bytes2))", largeNeg, 0xff0002, "ab"),
encodeArgs()
);
ABI_CHECK(
callContractFunction("f((int16,uint8,bytes2))", largeNeg, 0xff, "abcd"),
encodeArgs()
); );
) )
} }

4
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -8244,8 +8244,8 @@ BOOST_AUTO_TEST_CASE(calldata_struct_cleaning)
// double check that the valid case goes through // double check that the valid case goes through
ABI_CHECK(callContractFunction("f((uint8,bytes1))", u256(0x12), bytes{0x34} + bytes(31,0)), encodeArgs(0x12, bytes{0x34} + bytes(31,0))); ABI_CHECK(callContractFunction("f((uint8,bytes1))", u256(0x12), bytes{0x34} + bytes(31,0)), encodeArgs(0x12, bytes{0x34} + bytes(31,0)));
ABI_CHECK(callContractFunction("f((uint8,bytes1))", u256(0x1234), bytes{0x56, 0x78} + bytes(30,0)), encodeArgs(0x34, bytes{0x56} + bytes(31,0))); ABI_CHECK(callContractFunction("f((uint8,bytes1))", u256(0x1234), bytes{0x56, 0x78} + bytes(30,0)), encodeArgs());
ABI_CHECK(callContractFunction("f((uint8,bytes1))", u256(-1), u256(-1)), encodeArgs(0xFF, bytes{0xFF} + bytes(31,0))); ABI_CHECK(callContractFunction("f((uint8,bytes1))", u256(-1), u256(-1)), encodeArgs());
} }
BOOST_AUTO_TEST_CASE(calldata_struct_function_type) BOOST_AUTO_TEST_CASE(calldata_struct_function_type)