diff options
| author | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2015-04-20 20:55:58 +0800 |
| commit | 8caf1f723ffe9c8592e995f6e82571fbe2185fd0 (patch) | |
| tree | bbcd407e41e4bfd4809e576ff355003f799eeb7c /TestHelper.cpp | |
| parent | 6b08b99b5ef319837f9293cca6fd74803fe4688d (diff) | |
| parent | 71012a83e86dac3a899780219a78f18acd1708c5 (diff) | |
| download | dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.gz dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.bz2 dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.lz dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.xz dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.tar.zst dexon-solidity-8caf1f723ffe9c8592e995f6e82571fbe2185fd0.zip | |
Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Conflicts:
libsolidity/AST.cpp
libsolidity/AST.h
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index 92a8258a..ed844e96 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -123,7 +123,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) { static const set<string> hashes {"bloom" , "coinbase", "hash", "mixHash", "parentHash", "receiptTrie", "stateRoot", "transactionsTrie", "uncleHash", "currentCoinbase", - "previousHash", "to", "address", "caller", "origin", "secretKey"}; + "previousHash", "to", "address", "caller", "origin", "secretKey", "data"}; for (auto& i: _o) { @@ -140,7 +140,7 @@ json_spirit::mObject& ImportTest::makeAllFieldsHex(json_spirit::mObject& _o) str = value.get_str(); else continue; - _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str))); + _o[key] = (str.substr(0, 2) == "0x") ? str : "0x" + toHex(toCompactBigEndian(toInt(str), 1)); } return _o; } @@ -363,8 +363,8 @@ json_spirit::mObject fillJsonWithState(State _state) for (auto const& a: _state.addresses()) { json_spirit::mObject o; - o["balance"] = "0x" + toHex(toCompactBigEndian(_state.balance(a.first))); - o["nonce"] = "0x" + toHex(toCompactBigEndian(_state.transactionsFrom(a.first))); + o["balance"] = "0x" + toHex(toCompactBigEndian(_state.balance(a.first), 1)); + o["nonce"] = "0x" + toHex(toCompactBigEndian(_state.transactionsFrom(a.first), 1)); { json_spirit::mObject store; for (auto const& s: _state.storage(a.first)) |