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

Remove sha3/suicide from assembly tests

Browse Source
This commit is contained in:
Jason Cobb 2018-04-16 18:46:14 -04:00 committed by Alex Beregszaszi
parent 6e29775d39
commit 7de0d56aae
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/libsolidity/InlineAssembly.cpp
View File

@ -178,9 +178,9 @@ BOOST_AUTO_TEST_CASE(simple_instructions)
BOOST_CHECK(successParse("{ dup1 dup1 mul dup1 sub pop }")); BOOST_CHECK(successParse("{ dup1 dup1 mul dup1 sub pop }"));
} }
BOOST_AUTO_TEST_CASE(suicide_selfdestruct) BOOST_AUTO_TEST_CASE(selfdestruct)
{ {
BOOST_CHECK(successParse("{ 0x01 suicide 0x02 selfdestruct }")); BOOST_CHECK(successParse("{ 0x02 selfdestruct }"));
} }
BOOST_AUTO_TEST_CASE(keywords) BOOST_AUTO_TEST_CASE(keywords)
@ -740,8 +740,6 @@ BOOST_AUTO_TEST_CASE(keccak256)
{ {
BOOST_CHECK(successAssemble("{ 0 0 keccak256 pop }")); BOOST_CHECK(successAssemble("{ 0 0 keccak256 pop }"));
BOOST_CHECK(successAssemble("{ pop(keccak256(0, 0)) }")); BOOST_CHECK(successAssemble("{ pop(keccak256(0, 0)) }"));
BOOST_CHECK(successAssemble("{ 0 0 sha3 pop }"));
BOOST_CHECK(successAssemble("{ pop(sha3(0, 0)) }"));
} }
BOOST_AUTO_TEST_CASE(returndatasize) BOOST_AUTO_TEST_CASE(returndatasize)

25
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -8585,15 +8585,15 @@ BOOST_AUTO_TEST_CASE(inline_array_return)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
contract C { contract C {
uint8[] tester; uint8[] tester;
function f() returns (uint8[5]) { function f() returns (uint8[5]) {
return ([1,2,3,4,5]); return ([1,2,3,4,5]);
} }
function test() returns (uint8, uint8, uint8, uint8, uint8) { function test() returns (uint8, uint8, uint8, uint8, uint8) {
tester = f(); tester = f();
return (tester[0], tester[1], tester[2], tester[3], tester[4]); return (tester[0], tester[1], tester[2], tester[3], tester[4]);
} }
} }
)"; )";
compileAndRun(sourceCode, 0, "C"); compileAndRun(sourceCode, 0, "C");
@ -8617,13 +8617,13 @@ BOOST_AUTO_TEST_CASE(inline_array_singleton)
BOOST_AUTO_TEST_CASE(inline_long_string_return) BOOST_AUTO_TEST_CASE(inline_long_string_return)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
contract C { contract C {
function f() returns (string) { function f() returns (string) {
return (["somethingShort", "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"][1]); return (["somethingShort", "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"][1]);
} }
} }
)"; )";
string strLong = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"; string strLong = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
compileAndRun(sourceCode, 0, "C"); compileAndRun(sourceCode, 0, "C");
ABI_CHECK(callContractFunction("f()"), encodeDyn(strLong)); ABI_CHECK(callContractFunction("f()"), encodeDyn(strLong));
@ -11431,26 +11431,11 @@ BOOST_AUTO_TEST_CASE(keccak256_assembly)
=: ret =: ret
} }
} }
function h() pure returns (bytes32 ret) {
assembly {
ret := sha3(0, 0)
}
}
function i() pure returns (bytes32 ret) {
assembly {
0
0
sha3
=: ret
}
}
} }
)"; )";
compileAndRun(sourceCode, 0, "C"); compileAndRun(sourceCode, 0, "C");
ABI_CHECK(callContractFunction("f()"), fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")); ABI_CHECK(callContractFunction("f()"), fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
ABI_CHECK(callContractFunction("g()"), fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470")); ABI_CHECK(callContractFunction("g()"), fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
ABI_CHECK(callContractFunction("h()"), fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
ABI_CHECK(callContractFunction("i()"), fromHex("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"));
} }
BOOST_AUTO_TEST_CASE(multi_modifiers) BOOST_AUTO_TEST_CASE(multi_modifiers)