GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a7a36590f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25223)

Browse source
This commit is contained in:
James Dorfman 2024-09-10 19:44:34 +00:00
commit 616633ec35
9 changed files with 58 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/test/util/setup_common.cpp
View file

@ -301,8 +301,7 @@ CBlock TestChain100Setup::CreateBlock(
const CScript& scriptPubKey,
CChainState& chainstate)
{
CTxMemPool empty_pool;
CBlock block = BlockAssembler{chainstate, empty_pool}.CreateNewBlock(scriptPubKey)->block;
CBlock block = BlockAssembler{chainstate, nullptr}.CreateNewBlock(scriptPubKey)->block;
Assert(block.vtx.size() == 1);
for (const CMutableTransaction& tx : txns) {