diff options
| author | benjaminion <ben@edginet.org> | 2017-06-14 05:20:14 +0800 |
|---|---|---|
| committer | benjaminion <ben@edginet.org> | 2017-06-14 05:20:14 +0800 |
| commit | 3299c479b6d8f90a13c6464acc0cb2e7db012ab0 (patch) | |
| tree | e808847b8c1b31a4cb268fc92c85651015ad45da /test/liblll/EndToEndTest.cpp | |
| parent | d3f4c97c533b2f64dda9fe7bdf5848f6c8bbb300 (diff) | |
| download | dexon-solidity-3299c479b6d8f90a13c6464acc0cb2e7db012ab0.tar.gz dexon-solidity-3299c479b6d8f90a13c6464acc0cb2e7db012ab0.tar.zst dexon-solidity-3299c479b6d8f90a13c6464acc0cb2e7db012ab0.zip | |
LLL: fix handling of "sha3" expression
When PR #2317 changed the EVM opcode from SHA3 to KECCAK256 it broke the `(sha3 loc len)` expression in LLL. This PR fixes things while allowing existing code using the sha3 expression (such as the ENS registrar) to continue to compile. I.e. both `(keccak256 loc len)` and `(sha3 loc len)` may be used, and the existing related sha3 macros continue to work.
Three end-to-end test cases have been added for kekkac256 and sha3.
Diffstat (limited to 'test/liblll/EndToEndTest.cpp')
| -rw-r--r-- | test/liblll/EndToEndTest.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/test/liblll/EndToEndTest.cpp b/test/liblll/EndToEndTest.cpp index c8e7adf1..7f1924c2 100644 --- a/test/liblll/EndToEndTest.cpp +++ b/test/liblll/EndToEndTest.cpp @@ -291,6 +291,43 @@ BOOST_AUTO_TEST_CASE(zeroarg_macro) BOOST_CHECK(callFallback() == encodeArgs(u256(0x1234))); } +BOOST_AUTO_TEST_CASE(keccak256_32bytes) +{ + char const* sourceCode = R"( + (returnlll + (seq + (mstore 0x00 0x01) + (return (keccak256 0x00 0x20)))) + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callFallback() == encodeArgs( + fromHex("b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6"))); +} + +BOOST_AUTO_TEST_CASE(sha3_two_args) +{ + char const* sourceCode = R"( + (returnlll + (seq + (mstore 0x00 0x01) + (return (sha3 0x00 0x20)))) + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callFallback() == encodeArgs( + fromHex("b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6"))); +} + +BOOST_AUTO_TEST_CASE(sha3_one_arg) +{ + char const* sourceCode = R"( + (returnlll + (return (sha3 0x01))) + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callFallback() == encodeArgs( + fromHex("b10e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6"))); +} + BOOST_AUTO_TEST_SUITE_END() } |