diff options
| author | chriseth <chris@ethereum.org> | 2018-03-07 03:09:52 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2018-04-12 19:09:38 +0800 |
| commit | e133b1a0cd78acebb0db5448ec62e62ae0060fa2 (patch) | |
| tree | 94ba71975ad08eecd4622ce5f52bb4f896b40862 /test | |
| parent | fcb7a2721636a9a2f05659610fc05fa8513f745d (diff) | |
| download | dexon-solidity-e133b1a0cd78acebb0db5448ec62e62ae0060fa2.tar dexon-solidity-e133b1a0cd78acebb0db5448ec62e62ae0060fa2.tar.gz dexon-solidity-e133b1a0cd78acebb0db5448ec62e62ae0060fa2.tar.bz2 dexon-solidity-e133b1a0cd78acebb0db5448ec62e62ae0060fa2.tar.lz dexon-solidity-e133b1a0cd78acebb0db5448ec62e62ae0060fa2.tar.xz dexon-solidity-e133b1a0cd78acebb0db5448ec62e62ae0060fa2.tar.zst dexon-solidity-e133b1a0cd78acebb0db5448ec62e62ae0060fa2.zip | |
Adjust expectations in case of homestead VM.
Diffstat (limited to 'test')
| -rw-r--r-- | test/libsolidity/SolidityEndToEndTest.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index c7d8f917..600757f1 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -10452,8 +10452,9 @@ BOOST_AUTO_TEST_CASE(revert_with_cause) } )"; compileAndRun(sourceCode, 0, "C"); - ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "test123")); - ABI_CHECK(callContractFunction("g()"), encodeArgs(0, 0x40, 0xa0, 0, 0x40, 44, "test1234567890123456789012345678901234567890")); + bool const haveReturndata = dev::test::Options::get().evmVersion().supportsReturndata(); + ABI_CHECK(callContractFunction("f()"), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "test123") : bytes()); + ABI_CHECK(callContractFunction("g()"), haveReturndata ? encodeArgs(0, 0x40, 0xa0, 0, 0x40, 44, "test1234567890123456789012345678901234567890") : bytes()); } BOOST_AUTO_TEST_CASE(require_with_message) @@ -10505,11 +10506,12 @@ BOOST_AUTO_TEST_CASE(require_with_message) } )"; compileAndRun(sourceCode, 0, "C"); - ABI_CHECK(callContractFunction("f(uint256)", 8), encodeArgs(1, 0x40, 0)); - ABI_CHECK(callContractFunction("f(uint256)", 5), encodeArgs(0, 0x40, 0x80, 0, 0x40, 6, "failed")); - ABI_CHECK(callContractFunction("g()"), encodeArgs(1, 0x40, 0)); - ABI_CHECK(callContractFunction("g()"), encodeArgs(0, 0x40, 0x80, 0, 0x40, 18 , "only on second run")); - ABI_CHECK(callContractFunction("h()"), encodeArgs(0, 0x40, 0x80, 0, 0x40, 3, "abc")); + bool const haveReturndata = dev::test::Options::get().evmVersion().supportsReturndata(); + ABI_CHECK(callContractFunction("f(uint256)", 8), haveReturndata ? encodeArgs(1, 0x40, 0) : bytes()); + ABI_CHECK(callContractFunction("f(uint256)", 5), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 6, "failed") : bytes()); + ABI_CHECK(callContractFunction("g()"), haveReturndata ? encodeArgs(1, 0x40, 0) : bytes()); + ABI_CHECK(callContractFunction("g()"), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 18 , "only on second run") : bytes()); + ABI_CHECK(callContractFunction("h()"), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 3, "abc") : bytes()); } BOOST_AUTO_TEST_CASE(bubble_up_error_messages) @@ -10545,8 +10547,9 @@ BOOST_AUTO_TEST_CASE(bubble_up_error_messages) } )"; compileAndRun(sourceCode, 0, "C"); - ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message")); - ABI_CHECK(callContractFunction("g()"), encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message")); + bool const haveReturndata = dev::test::Options::get().evmVersion().supportsReturndata(); + ABI_CHECK(callContractFunction("f()"), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message") : bytes()); + ABI_CHECK(callContractFunction("g()"), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message") : bytes()); } BOOST_AUTO_TEST_CASE(bubble_up_error_messages_through_transfer) @@ -10579,7 +10582,8 @@ BOOST_AUTO_TEST_CASE(bubble_up_error_messages_through_transfer) } )"; compileAndRun(sourceCode, 0, "C"); - ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message")); + bool const haveReturndata = dev::test::Options::get().evmVersion().supportsReturndata(); + ABI_CHECK(callContractFunction("f()"), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message") : bytes()); } BOOST_AUTO_TEST_CASE(bubble_up_error_messages_through_create) @@ -10614,7 +10618,8 @@ BOOST_AUTO_TEST_CASE(bubble_up_error_messages_through_create) } )"; compileAndRun(sourceCode, 0, "C"); - ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message")); + bool const haveReturndata = dev::test::Options::get().evmVersion().supportsReturndata(); + ABI_CHECK(callContractFunction("f()"), haveReturndata ? encodeArgs(0, 0x40, 0x80, 0, 0x40, 7, "message") : bytes()); } BOOST_AUTO_TEST_CASE(negative_stack_height) |