aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCJentzsch <jentzsch.software@gmail.com>2015-02-12 20:10:04 +0800
committerCJentzsch <jentzsch.software@gmail.com>2015-02-12 20:10:04 +0800
commit004918d40046a2b267cf7fc7ec305f2fdccf8a0c (patch)
tree8a28d6422d34a76038d009e068be8eff807d23d6
parent0e634cb1fc3d80abcdeaf4c4cb6d31e8464693ed (diff)
parentd37f6cfb9f04d4148228784521147bf39584be92 (diff)
downloaddexon-solidity-004918d40046a2b267cf7fc7ec305f2fdccf8a0c.tar.gz
dexon-solidity-004918d40046a2b267cf7fc7ec305f2fdccf8a0c.tar.zst
dexon-solidity-004918d40046a2b267cf7fc7ec305f2fdccf8a0c.zip
Merge remote-tracking branch 'upstream/develop' into blockTests
-rw-r--r--SolidityEndToEndTest.cpp12
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)