aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCJentzsch <jentzsch.software@gmail.com>2015-04-22 22:53:43 +0800
committerCJentzsch <jentzsch.software@gmail.com>2015-04-22 22:53:43 +0800
commit75466430ce5e3bac514cb34d90a624168df1dbc9 (patch)
tree27bb7d81bee9da26f24f0c37c293fbbc888b9d37
parenta26416fcef6db427254269300bf506681eaa22ed (diff)
parentfcb772293bcc07f1723c39fa24da14cb5280e78e (diff)
downloaddexon-solidity-75466430ce5e3bac514cb34d90a624168df1dbc9.tar
dexon-solidity-75466430ce5e3bac514cb34d90a624168df1dbc9.tar.gz
dexon-solidity-75466430ce5e3bac514cb34d90a624168df1dbc9.tar.bz2
dexon-solidity-75466430ce5e3bac514cb34d90a624168df1dbc9.tar.lz
dexon-solidity-75466430ce5e3bac514cb34d90a624168df1dbc9.tar.xz
dexon-solidity-75466430ce5e3bac514cb34d90a624168df1dbc9.tar.zst
dexon-solidity-75466430ce5e3bac514cb34d90a624168df1dbc9.zip
Merge remote-tracking branch 'upstream/develop' into gasPricerTests
-rw-r--r--libsolidity/SolidityEndToEndTest.cpp61
1 files changed, 61 insertions, 0 deletions
diff --git a/libsolidity/SolidityEndToEndTest.cpp b/libsolidity/SolidityEndToEndTest.cpp
index 8b926d6c..596f710b 100644
--- a/libsolidity/SolidityEndToEndTest.cpp
+++ b/libsolidity/SolidityEndToEndTest.cpp
@@ -2340,6 +2340,49 @@ BOOST_AUTO_TEST_CASE(event_lots_of_data)
BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(address,bytes32,uint256,bool)")));
}
+BOOST_AUTO_TEST_CASE(event_really_lots_of_data)
+{
+ char const* sourceCode = R"(
+ contract ClientReceipt {
+ event Deposit(uint fixeda, bytes dynx, uint fixedb);
+ function deposit() {
+ Deposit(10, msg.data, 15);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("deposit()");
+ BOOST_REQUIRE_EQUAL(m_logs.size(), 1);
+ BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress);
+ BOOST_CHECK(m_logs[0].data == encodeArgs(10, 4, 15) + FixedHash<4>(dev::sha3("deposit()")).asBytes());
+ BOOST_REQUIRE_EQUAL(m_logs[0].topics.size(), 1);
+ BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(uint256,bytes,uint256)")));
+}
+
+BOOST_AUTO_TEST_CASE(event_really_lots_of_data_from_storage)
+{
+ char const* sourceCode = R"(
+ contract ClientReceipt {
+ bytes x;
+ event Deposit(uint fixeda, bytes dynx, uint fixedb);
+ function deposit() {
+ x.length = 3;
+ x[0] = "A";
+ x[1] = "B";
+ x[2] = "C";
+ Deposit(10, x, 15);
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ callContractFunction("deposit()");
+ BOOST_REQUIRE_EQUAL(m_logs.size(), 1);
+ BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress);
+ BOOST_CHECK(m_logs[0].data == encodeArgs(10, 3, 15) + asBytes("ABC"));
+ BOOST_REQUIRE_EQUAL(m_logs[0].topics.size(), 1);
+ BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(uint256,bytes,uint256)")));
+}
+
BOOST_AUTO_TEST_CASE(empty_name_input_parameter_with_named_one)
{
char const* sourceCode = R"(
@@ -2428,6 +2471,24 @@ BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals)
bytes{0x66, 0x6f, 0x6f})));
}
+BOOST_AUTO_TEST_CASE(sha3_with_bytes)
+{
+ char const* sourceCode = R"(
+ contract c {
+ bytes data;
+ function foo() returns (bool)
+ {
+ data.length = 3;
+ data[0] = "f";
+ data[1] = "o";
+ data[2] = "o";
+ return sha3(data) == sha3("foo");
+ }
+ })";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("foo()") == encodeArgs(true));
+}
+
BOOST_AUTO_TEST_CASE(generic_call)
{
char const* sourceCode = R"**(