highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-25 16:31:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

test/util: Use existing chainman in ::PrepareBlock

Browse Source
This commit is contained in:
Carl Dong 2020-10-14 17:00:00 -04:00
parent 464c313e30
commit f0dd5e6bb4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/util/mining.cpp
View File

@ -74,12 +74,12 @@ CTxIn MineBlock(const NodeContext& node, const CScript& coinbase_scriptPubKey)
std::shared_ptr<CBlock> PrepareBlock(const NodeContext& node, const CScript& coinbase_scriptPubKey) std::shared_ptr<CBlock> PrepareBlock(const NodeContext& node, const CScript& coinbase_scriptPubKey)
{ {
auto block = std::make_shared<CBlock>( auto block = std::make_shared<CBlock>(
BlockAssembler{::ChainstateActive(), *Assert(node.mempool), Params()} BlockAssembler{Assert(node.chainman)->ActiveChainstate(), *Assert(node.mempool), Params()}
.CreateNewBlock(coinbase_scriptPubKey) .CreateNewBlock(coinbase_scriptPubKey)
->block); ->block);
LOCK(cs_main); LOCK(cs_main);
block->nTime = ::ChainActive().Tip()->GetMedianTimePast() + 1; block->nTime = Assert(node.chainman)->ActiveChain().Tip()->GetMedianTimePast() + 1;
block->hashMerkleRoot = BlockMerkleRoot(*block); block->hashMerkleRoot = BlockMerkleRoot(*block);
return block; return block;