sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge bitcoin#13806: Fix bench/block_assemble assert failure

Browse Source
This commit is contained in:
Kittywhiskers Van Gogh 2018-07-30 11:33:05 -04:00
parent a86b67d040
commit f71a9e586e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bench/block_assemble.cpp
View File

@ -97,11 +97,15 @@ static void AssembleBlock(benchmark::Bench& bench)
if (NUM_BLOCKS - b >= COINBASE_MATURITY)
txs.at(b) = MakeTransactionRef(tx);
}
{
LOCK(::cs_main); // Required for ::AcceptToMemoryPool.
for (const auto& txr : txs) {
CValidationState state;
bool ret{::AcceptToMemoryPool(::mempool, state, txr, nullptr /* pfMissingInputs */, false /* bypass_limits */, /* nAbsurdFee */ 0)};
assert(ret);
}
}
bench.minEpochIterations(700).run([&] {
PrepareBlock(SCRIPT_PUB);