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

Merge 80a699fda9 into merged_master (Bitcoin PR #21525)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-29 01:29:25 +00:00
commit bc51e4e896
15 changed files with 150 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -272,7 +272,7 @@ CBlock TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransa
{
const CChainParams& chainparams = Params();
CTxMemPool empty_pool;
CBlock block = BlockAssembler(empty_pool, chainparams).CreateNewBlock(::ChainstateActive(), scriptPubKey)->block;
CBlock block = BlockAssembler(::ChainstateActive(), empty_pool, chainparams).CreateNewBlock(scriptPubKey)->block;
Assert(block.vtx.size() == 1);
for (const CMutableTransaction& tx : txns) {