diff options
| author | Gav Wood <g@ethdev.com> | 2015-07-27 22:37:45 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-07-27 22:37:45 +0800 |
| commit | 028c2e93f89923db02171558581c291422c6c1c1 (patch) | |
| tree | f7bdbc5d03a026959668e6373ac79553c06fe56e | |
| parent | 9e61a8adb1c4368b56cd0bbe4f9423e0c433c6ee (diff) | |
| parent | 795037215b52be5a4c847f9ddc2e69aa62894e8e (diff) | |
| download | dexon-solidity-028c2e93f89923db02171558581c291422c6c1c1.tar.gz dexon-solidity-028c2e93f89923db02171558581c291422c6c1c1.tar.zst dexon-solidity-028c2e93f89923db02171558581c291422c6c1c1.zip | |
Merge pull request #2556 from arkpar/bc-test-fix
Fixed filltests
| -rw-r--r-- | TestHelper.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index aec72285..ab9a1749 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -69,6 +69,7 @@ void mine(State& s, BlockChain const& _bc) sealer->onSealGenerated([&](bytes const& sealedHeader){ sealed = sealedHeader; }); sealer->generateSeal(s.info()); sealed.waitNot({}); + sealer.reset(); s.sealBlock(sealed); } @@ -79,7 +80,8 @@ void mine(Ethash::BlockHeader& _bi) sealer->onSealGenerated([&](bytes const& sealedHeader){ sealed = sealedHeader; }); sealer->generateSeal(_bi); sealed.waitNot({}); - _bi = Ethash::BlockHeader(sealed); + sealer.reset(); + _bi = Ethash::BlockHeader(sealed, IgnoreSeal, h256{}, HeaderData); } } @@ -841,7 +843,7 @@ dev::eth::Ethash::BlockHeader constructHeader( rlpStream << _parentHash << _sha3Uncles << _coinbaseAddress << _stateRoot << _transactionsRoot << _receiptsRoot << _logBloom << _difficulty << _number << _gasLimit << _gasUsed << _timestamp << _extraData << h256{} << Nonce{}; - return Ethash::BlockHeader(rlpStream.out()); + return Ethash::BlockHeader(rlpStream.out(), IgnoreSeal, h256{}, HeaderData); } void updateEthashSeal(dev::eth::Ethash::BlockHeader& _header, h256 const& _mixHash, dev::eth::Nonce const& _nonce) @@ -855,7 +857,7 @@ void updateEthashSeal(dev::eth::Ethash::BlockHeader& _header, h256 const& _mixHa header << sourceRlp[i]; header << _mixHash << _nonce; - _header = Ethash::BlockHeader(header.out()); + _header = Ethash::BlockHeader(header.out(), IgnoreSeal, h256{}, HeaderData); } namespace |