diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-02-12 13:02:05 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-02-12 13:02:05 +0800 |
| commit | ca39f95248b8626e6239f852c259a93148bbe7da (patch) | |
| tree | ab576dc148c931a354a52416fb3338e99bcd0f99 | |
| parent | d14c5eb85a97c82c0363a225e7d3717ef0cc53dc (diff) | |
| parent | d37f6cfb9f04d4148228784521147bf39584be92 (diff) | |
| download | dexon-solidity-ca39f95248b8626e6239f852c259a93148bbe7da.tar dexon-solidity-ca39f95248b8626e6239f852c259a93148bbe7da.tar.gz dexon-solidity-ca39f95248b8626e6239f852c259a93148bbe7da.tar.bz2 dexon-solidity-ca39f95248b8626e6239f852c259a93148bbe7da.tar.lz dexon-solidity-ca39f95248b8626e6239f852c259a93148bbe7da.tar.xz dexon-solidity-ca39f95248b8626e6239f852c259a93148bbe7da.tar.zst dexon-solidity-ca39f95248b8626e6239f852c259a93148bbe7da.zip | |
Merge branch 'develop' into p2p
| -rw-r--r-- | SolidityEndToEndTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp index 13a666fb..8a21290c 100644 --- a/SolidityEndToEndTest.cpp +++ b/SolidityEndToEndTest.cpp @@ -963,7 +963,7 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors) compileAndRun(sourceCode); BOOST_CHECK(callContractFunction("data()") == encodeArgs(8)); BOOST_CHECK(callContractFunction("name()") == encodeArgs("Celina")); - BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(bytes({0x7b})))); + BOOST_CHECK(callContractFunction("a_hash()") == encodeArgs(dev::sha3(bytes{0x7b}))); BOOST_CHECK(callContractFunction("an_address()") == encodeArgs(toBigEndian(u160(0x1337)))); BOOST_CHECK(callContractFunction("super_secret_data()") == bytes()); } @@ -2202,8 +2202,8 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_numeric_literals) BOOST_CHECK(callContractFunction("foo(uint256,uint16)", 10, 12) == encodeArgs( dev::sha3( toBigEndian(u256(10)) + - bytes({0x0, 0xc}) + - bytes({0x91})))); + bytes{0x0, 0xc} + + bytes{0x91}))); } BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals) @@ -2226,9 +2226,9 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals) BOOST_CHECK(callContractFunction("bar(uint256,uint16)", 10, 12) == encodeArgs( dev::sha3( toBigEndian(u256(10)) + - bytes({0x0, 0xc}) + - bytes({0x91}) + - bytes({0x66, 0x6f, 0x6f})))); + bytes{0x0, 0xc} + + bytes{0x91} + + bytes{0x66, 0x6f, 0x6f}))); } BOOST_AUTO_TEST_CASE(generic_call) |