mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge branch 'develop' into jsoncpp_path
This commit is contained in:
commit
b3c0cfef4b
@ -963,7 +963,7 @@ BOOST_AUTO_TEST_CASE(multiple_elementary_accessors)
|
|||||||
compileAndRun(sourceCode);
|
compileAndRun(sourceCode);
|
||||||
BOOST_CHECK(callContractFunction("data()") == encodeArgs(8));
|
BOOST_CHECK(callContractFunction("data()") == encodeArgs(8));
|
||||||
BOOST_CHECK(callContractFunction("name()") == encodeArgs("Celina"));
|
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("an_address()") == encodeArgs(toBigEndian(u160(0x1337))));
|
||||||
BOOST_CHECK(callContractFunction("super_secret_data()") == bytes());
|
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(
|
BOOST_CHECK(callContractFunction("foo(uint256,uint16)", 10, 12) == encodeArgs(
|
||||||
dev::sha3(
|
dev::sha3(
|
||||||
toBigEndian(u256(10)) +
|
toBigEndian(u256(10)) +
|
||||||
bytes({0x0, 0xc}) +
|
bytes{0x0, 0xc} +
|
||||||
bytes({0x91}))));
|
bytes{0x91})));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(sha3_multiple_arguments_with_string_literals)
|
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(
|
BOOST_CHECK(callContractFunction("bar(uint256,uint16)", 10, 12) == encodeArgs(
|
||||||
dev::sha3(
|
dev::sha3(
|
||||||
toBigEndian(u256(10)) +
|
toBigEndian(u256(10)) +
|
||||||
bytes({0x0, 0xc}) +
|
bytes{0x0, 0xc} +
|
||||||
bytes({0x91}) +
|
bytes{0x91} +
|
||||||
bytes({0x66, 0x6f, 0x6f}))));
|
bytes{0x66, 0x6f, 0x6f})));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(generic_call)
|
BOOST_AUTO_TEST_CASE(generic_call)
|
||||||
|
Loading…
Reference in New Issue
Block a user