diff options
| author | Gav Wood <g@ethdev.com> | 2015-03-14 03:12:45 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-03-14 03:12:45 +0800 |
| commit | 1ef0a594a3b788a0925b6a3dd5b5055de1f966cf (patch) | |
| tree | 5ee72ce786d64a4af3d36549e2e75eb9e7aec984 /blockchain.cpp | |
| parent | 827b1e2b3db4def5a296ad32b264e0a8612df064 (diff) | |
| parent | 132533babb710cc3c210550c1f70b1f13aa6fcb4 (diff) | |
| download | dexon-solidity-1ef0a594a3b788a0925b6a3dd5b5055de1f966cf.tar dexon-solidity-1ef0a594a3b788a0925b6a3dd5b5055de1f966cf.tar.gz dexon-solidity-1ef0a594a3b788a0925b6a3dd5b5055de1f966cf.tar.bz2 dexon-solidity-1ef0a594a3b788a0925b6a3dd5b5055de1f966cf.tar.lz dexon-solidity-1ef0a594a3b788a0925b6a3dd5b5055de1f966cf.tar.xz dexon-solidity-1ef0a594a3b788a0925b6a3dd5b5055de1f966cf.tar.zst dexon-solidity-1ef0a594a3b788a0925b6a3dd5b5055de1f966cf.zip | |
Merge pull request #1314 from CJentzsch/blockTests
remove seedhash from block header tests
Diffstat (limited to 'blockchain.cpp')
| -rw-r--r-- | blockchain.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/blockchain.cpp b/blockchain.cpp index 045f2de5..ac872c0f 100644 --- a/blockchain.cpp +++ b/blockchain.cpp @@ -386,7 +386,7 @@ void doBlockchainTests(json_spirit::mValue& _v, bool _fillin) { mObject uBlH = uBlHeaderObj.get_obj(); cout << "uBlH.size(): " << uBlH.size() << endl; - BOOST_REQUIRE(uBlH.size() == 17); + BOOST_REQUIRE(uBlH.size() == 16); bytes uncleRLP = createBlockRLPFromFields(uBlH); const RLP c_uRLP(uncleRLP); BlockInfo uncleBlockHeader; @@ -533,7 +533,7 @@ void overwriteBlockHeader(BlockInfo& _current_BlockHeader, mObject& _blObj) std::pair<MineInfo, Ethash::Proof> ret; while (!ProofOfWork::verify(_current_BlockHeader)) { - ret = pow.mine(_current_BlockHeader, 1000, true, true); // tie(ret, blockFromFields.nonce) + ret = pow.mine(_current_BlockHeader, 1000, true, true); Ethash::assignResult(ret.second, _current_BlockHeader); } } @@ -580,7 +580,7 @@ void updatePoW(BlockInfo& _bi) std::pair<MineInfo, Ethash::Proof> ret; while (!ProofOfWork::verify(_bi)) { - ret = pow.mine(_bi, 10000, true, true); // tie(ret, blockFromFields.nonce) + ret = pow.mine(_bi, 10000, true, true); Ethash::assignResult(ret.second, _bi); } _bi.hash = _bi.headerHash(WithNonce); |