diff options
author | Jorge Timón <jtimon@jtimon.cc> | 2015-04-20 00:17:11 +0200 |
---|---|---|
committer | Jorge Timón <jtimon@jtimon.cc> | 2015-11-11 13:21:17 +0100 |
commit | 598e4945872349ead03ff0cddc87c14b925157ec (patch) | |
tree | 24895389627372eadbb9a47e559f596d88cc09c4 /src/test/test_bitcoin.cpp | |
parent | 3ac70609345a249a74fad61b70f93e8a19245011 (diff) |
Chainparams: Explicit CChainParams arg for main (pre miner):
-ProcessNewBlock
-TestBlockValidity
Diffstat (limited to 'src/test/test_bitcoin.cpp')
-rw-r--r-- | src/test/test_bitcoin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp index 23e5e66d84..898dbded41 100644 --- a/src/test/test_bitcoin.cpp +++ b/src/test/test_bitcoin.cpp @@ -114,6 +114,7 @@ TestChain100Setup::TestChain100Setup() : TestingSetup(CBaseChainParams::REGTEST) CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& txns, const CScript& scriptPubKey) { + const CChainParams& chainparams = Params(); CBlockTemplate *pblocktemplate = CreateNewBlock(scriptPubKey); CBlock& block = pblocktemplate->block; @@ -125,10 +126,10 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>& unsigned int extraNonce = 0; IncrementExtraNonce(&block, chainActive.Tip(), extraNonce); - while (!CheckProofOfWork(block.GetHash(), block.nBits, Params(CBaseChainParams::REGTEST).GetConsensus())) ++block.nNonce; + while (!CheckProofOfWork(block.GetHash(), block.nBits, chainparams.GetConsensus())) ++block.nNonce; CValidationState state; - ProcessNewBlock(state, NULL, &block, true, NULL); + ProcessNewBlock(state, chainparams, NULL, &block, true, NULL); CBlock result = block; delete pblocktemplate; |