Browse Source

Merge pull request #2624 from CJentzsch/FrontierTests

fix BlockChainTest creation
cl-refactor
Gav Wood 10 years ago
parent
commit
7e6365016f
  1. 6
      test/TestHelper.cpp
  2. 2
      test/libethereum/blockchain.cpp

6
test/TestHelper.cpp

@ -81,7 +81,7 @@ void mine(Ethash::BlockHeader& _bi)
sealer->generateSeal(_bi);
sealed.waitNot({});
sealer.reset();
_bi = Ethash::BlockHeader(sealed, IgnoreSeal, h256{}, HeaderData);
_bi = Ethash::BlockHeader(sealed, CheckNothing, h256{}, HeaderData);
}
}
@ -843,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(), IgnoreSeal, h256{}, HeaderData);
return Ethash::BlockHeader(rlpStream.out(), CheckNothing, h256{}, HeaderData);
}
void updateEthashSeal(dev::eth::Ethash::BlockHeader& _header, h256 const& _mixHash, dev::eth::Nonce const& _nonce)
@ -857,7 +857,7 @@ void updateEthashSeal(dev::eth::Ethash::BlockHeader& _header, h256 const& _mixHa
header << sourceRlp[i];
header << _mixHash << _nonce;
_header = Ethash::BlockHeader(header.out(), IgnoreSeal, h256{}, HeaderData);
_header = Ethash::BlockHeader(header.out(), CheckNothing, h256{}, HeaderData);
}
namespace

2
test/libethereum/blockchain.cpp

@ -833,7 +833,7 @@ BOOST_AUTO_TEST_CASE(bcGasPricerTest)
BOOST_AUTO_TEST_CASE(bcBruncleTest)
{
dev::test::executeTests("bcBruncleTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
if (c_network != Network::Frontier) dev::test::executeTests("bcBruncleTest", "/BlockchainTests",dev::test::getFolder(__FILE__) + "/BlockchainTestsFiller", dev::test::doBlockchainTests);
}
BOOST_AUTO_TEST_CASE(bcBlockGasLimitTest)

Loading…
Cancel
Save