mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-20 13:37:28 +02:00
Merge 2cfe379623 into merged_master (Bitcoin PR bitcoin/bitcoin#26823)
This commit is contained in:
commit
86799b1cb9
1 changed files with 2 additions and 2 deletions
|
|
@ -264,8 +264,8 @@ CTxMemPool::setEntries CTxMemPool::AssumeCalculateMemPoolAncestors(
|
|||
const Limits& limits,
|
||||
bool fSearchForParents /* = true */) const
|
||||
{
|
||||
auto result{Assume(CalculateMemPoolAncestors(entry, limits, fSearchForParents))};
|
||||
if (!result) {
|
||||
auto result{CalculateMemPoolAncestors(entry, limits, fSearchForParents)};
|
||||
if (!Assume(result)) {
|
||||
LogPrintLevel(BCLog::MEMPOOL, BCLog::Level::Error, "%s: CalculateMemPoolAncestors failed unexpectedly, continuing with empty ancestor set (%s)\n",
|
||||
calling_fn_name, util::ErrorString(result).original);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue