diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2018-06-13 02:19:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 02:19:49 +0800 |
| commit | 3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4 (patch) | |
| tree | 24a9326bb17dd69cfe2420a225b9ab90bf67332a /test/libsolidity/ABIEncoderTests.cpp | |
| parent | 451f56ec1cd032802b52ce81ad5950a441cf5e87 (diff) | |
| parent | 1dc28c065d91416caf778770ef57b73b30462b8d (diff) | |
| download | dexon-solidity-3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4.tar dexon-solidity-3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4.tar.gz dexon-solidity-3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4.tar.bz2 dexon-solidity-3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4.tar.lz dexon-solidity-3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4.tar.xz dexon-solidity-3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4.tar.zst dexon-solidity-3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4.zip | |
Merge pull request #4085 from ethereum/calldatapad
[BREAKING] Properly pad data from calldata.
Diffstat (limited to 'test/libsolidity/ABIEncoderTests.cpp')
| -rw-r--r-- | test/libsolidity/ABIEncoderTests.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/libsolidity/ABIEncoderTests.cpp b/test/libsolidity/ABIEncoderTests.cpp index 49db9ce1..5f15b28f 100644 --- a/test/libsolidity/ABIEncoderTests.cpp +++ b/test/libsolidity/ABIEncoderTests.cpp @@ -374,15 +374,12 @@ BOOST_AUTO_TEST_CASE(calldata) )"; string s("abcdef"); string t("abcdefgggggggggggggggggggggggggggggggggggggggghhheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeggg"); - bool newEncoder = false; BOTH_ENCODERS( compileAndRun(sourceCode); callContractFunction("f(bytes)", 0x20, s.size(), s); - // The old encoder did not pad to multiples of 32 bytes - REQUIRE_LOG_DATA(encodeArgs(0x20, s.size()) + (newEncoder ? encodeArgs(s) : asBytes(s))); + REQUIRE_LOG_DATA(encodeArgs(0x20, s.size(), s)); callContractFunction("f(bytes)", 0x20, t.size(), t); - REQUIRE_LOG_DATA(encodeArgs(0x20, t.size()) + (newEncoder ? encodeArgs(t) : asBytes(t))); - newEncoder = true; + REQUIRE_LOG_DATA(encodeArgs(0x20, t.size(), t)); ) } |