diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-04-06 16:20:58 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-04-06 16:20:58 +0800 |
| commit | b9ace5452ea869418c350d632f7e23fa83d6ff75 (patch) | |
| tree | 21b9af6219b11f7b696dca486753d76bc0df1892 /ClientBase.cpp | |
| parent | 8921dc0de43536cf94c43647282fb379a57888e9 (diff) | |
| parent | ac32ee3ec7f960f80442b00e55455661fa94572d (diff) | |
| download | dexon-solidity-b9ace5452ea869418c350d632f7e23fa83d6ff75.tar dexon-solidity-b9ace5452ea869418c350d632f7e23fa83d6ff75.tar.gz dexon-solidity-b9ace5452ea869418c350d632f7e23fa83d6ff75.tar.bz2 dexon-solidity-b9ace5452ea869418c350d632f7e23fa83d6ff75.tar.lz dexon-solidity-b9ace5452ea869418c350d632f7e23fa83d6ff75.tar.xz dexon-solidity-b9ace5452ea869418c350d632f7e23fa83d6ff75.tar.zst dexon-solidity-b9ace5452ea869418c350d632f7e23fa83d6ff75.zip | |
Merge remote-tracking branch 'upstream/develop' into addTests
Diffstat (limited to 'ClientBase.cpp')
| -rw-r--r-- | ClientBase.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/ClientBase.cpp b/ClientBase.cpp index 304182cf..7597b661 100644 --- a/ClientBase.cpp +++ b/ClientBase.cpp @@ -120,11 +120,15 @@ BOOST_AUTO_TEST_CASE(blocks) ETH_CHECK_EQUAL(expectedBlockInfoBloom, _blockInfo.logBloom); ETH_CHECK_EQUAL(expectedBlockInfoCoinbase, _blockInfo.coinbaseAddress); ETH_CHECK_EQUAL(expectedBlockInfoDifficulty, _blockInfo.difficulty); - ETH_CHECK_EQUAL_COLLECTIONS(expectedBlockInfoExtraData.begin(), expectedBlockInfoExtraData.end(), - _blockInfo.extraData.begin(), _blockInfo.extraData.end()); + ETH_CHECK_EQUAL_COLLECTIONS( + expectedBlockInfoExtraData.begin(), + expectedBlockInfoExtraData.end(), + _blockInfo.extraData.begin(), + _blockInfo.extraData.end() + ); ETH_CHECK_EQUAL(expectedBlockInfoGasLimit, _blockInfo.gasLimit); ETH_CHECK_EQUAL(expectedBlockInfoGasUsed, _blockInfo.gasUsed); - ETH_CHECK_EQUAL(expectedBlockInfoHash, _blockInfo.hash); + ETH_CHECK_EQUAL(expectedBlockInfoHash, _blockInfo.hash()); ETH_CHECK_EQUAL(expectedBlockInfoMixHash, _blockInfo.mixHash); ETH_CHECK_EQUAL(expectedBlockInfoNonce, _blockInfo.nonce); ETH_CHECK_EQUAL(expectedBlockInfoNumber, _blockInfo.number); @@ -155,8 +159,12 @@ BOOST_AUTO_TEST_CASE(blocks) u256 expectedTransactionSignatureS = h256(fromHex(_t["s"].asString())); // unsigned expectedTransactionSignatureV = jsToInt(t["v"].asString()); - ETH_CHECK_EQUAL_COLLECTIONS(expectedTransactionData.begin(), expectedTransactionData.end(), - _transaction.data().begin(), _transaction.data().end()); + ETH_CHECK_EQUAL_COLLECTIONS( + expectedTransactionData.begin(), + expectedTransactionData.end(), + _transaction.data().begin(), + _transaction.data().end() + ); ETH_CHECK_EQUAL(expectedTransactionGasLimit, _transaction.gas()); ETH_CHECK_EQUAL(expectedTransactionGasPrice, _transaction.gasPrice()); ETH_CHECK_EQUAL(expectedTransactionNonce, _transaction.nonce()); |