diff options
| author | Gav Wood <g@ethdev.com> | 2015-03-03 23:12:10 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-03-03 23:12:10 +0800 |
| commit | 102c8a530178ea87f64af938f7c4639250428d54 (patch) | |
| tree | 50123a2a85978088ca2b706418f7159af23180db | |
| parent | 66d2ec1d15c890ad58302c69068da4d5d1879c92 (diff) | |
| parent | 99263f0e3e7a58464e211479430c4a21dd6eb5a9 (diff) | |
| download | dexon-solidity-102c8a530178ea87f64af938f7c4639250428d54.tar dexon-solidity-102c8a530178ea87f64af938f7c4639250428d54.tar.gz dexon-solidity-102c8a530178ea87f64af938f7c4639250428d54.tar.bz2 dexon-solidity-102c8a530178ea87f64af938f7c4639250428d54.tar.lz dexon-solidity-102c8a530178ea87f64af938f7c4639250428d54.tar.xz dexon-solidity-102c8a530178ea87f64af938f7c4639250428d54.tar.zst dexon-solidity-102c8a530178ea87f64af938f7c4639250428d54.zip | |
Merge pull request #1193 from chriseth/sol_fixABIArrays
Fixed arrays in ABI.
| -rw-r--r-- | SolidityEndToEndTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SolidityEndToEndTest.cpp b/SolidityEndToEndTest.cpp index 9587a348..0b3836ad 100644 --- a/SolidityEndToEndTest.cpp +++ b/SolidityEndToEndTest.cpp @@ -2507,11 +2507,11 @@ BOOST_AUTO_TEST_CASE(struct_containing_bytes_copy_and_delete) compileAndRun(sourceCode); string data = "123456789012345678901234567890123"; BOOST_CHECK(m_state.storage(m_contractAddress).empty()); - BOOST_CHECK(callContractFunction("set(uint256,bytes,uint256)", u256(data.length()), 12, data, 13) == encodeArgs(true)); + BOOST_CHECK(callContractFunction("set(uint256,bytes,uint256)", 12, u256(data.length()), 13, data) == encodeArgs(true)); BOOST_CHECK(!m_state.storage(m_contractAddress).empty()); BOOST_CHECK(callContractFunction("copy()") == encodeArgs(true)); BOOST_CHECK(m_state.storage(m_contractAddress).empty()); - BOOST_CHECK(callContractFunction("set(uint256,bytes,uint256)", u256(data.length()), 12, data, 13) == encodeArgs(true)); + BOOST_CHECK(callContractFunction("set(uint256,bytes,uint256)", 12, u256(data.length()), 13, data) == encodeArgs(true)); BOOST_CHECK(!m_state.storage(m_contractAddress).empty()); BOOST_CHECK(callContractFunction("del()") == encodeArgs(true)); BOOST_CHECK(m_state.storage(m_contractAddress).empty()); @@ -2664,8 +2664,8 @@ BOOST_AUTO_TEST_CASE(bytes_in_arguments) bytes calldata1 = encodeArgs(u256(innercalldata1.length()), 12, innercalldata1, 13); string innercalldata2 = asString(FixedHash<4>(dev::sha3("g(uint256)")).asBytes() + encodeArgs(3)); bytes calldata = encodeArgs( - u256(innercalldata1.length()), u256(innercalldata2.length()), - 12, innercalldata1, innercalldata2, 13); + 12, u256(innercalldata1.length()), u256(innercalldata2.length()), 13, + innercalldata1, innercalldata2); BOOST_CHECK(callContractFunction("test(uint256,bytes,bytes,uint256)", calldata) == encodeArgs(12, (8 + 9) * 3, 13, u256(innercalldata1.length()))); } |