Skip to content

Commit 9e93b10

Browse files
committed
node/ifaces: Use existing MemPoolLimits
1 parent 38af2bc commit 9e93b10

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/node/interfaces.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -653,24 +653,25 @@ class ChainImpl : public Chain
653653
}
654654
void getPackageLimits(unsigned int& limit_ancestor_count, unsigned int& limit_descendant_count) override
655655
{
656-
limit_ancestor_count = gArgs.GetIntArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
657-
limit_descendant_count = gArgs.GetIntArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
656+
const CTxMemPool::Limits default_limits{};
657+
658+
const CTxMemPool::Limits& limits{m_node.mempool ? m_node.mempool->m_limits : default_limits};
659+
660+
limit_ancestor_count = limits.ancestor_count;
661+
limit_descendant_count = limits.descendant_count;
658662
}
659663
bool checkChainLimits(const CTransactionRef& tx) override
660664
{
661665
if (!m_node.mempool) return true;
662666
LockPoints lp;
663667
CTxMemPoolEntry entry(tx, 0, 0, 0, false, 0, lp);
664668
CTxMemPool::setEntries ancestors;
665-
auto limit_ancestor_count = gArgs.GetIntArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
666-
auto limit_ancestor_size = gArgs.GetIntArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT_KVB) * 1000;
667-
auto limit_descendant_count = gArgs.GetIntArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
668-
auto limit_descendant_size = gArgs.GetIntArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT_KVB) * 1000;
669+
const CTxMemPool::Limits& limits{m_node.mempool->m_limits};
669670
std::string unused_error_string;
670671
LOCK(m_node.mempool->cs);
671672
return m_node.mempool->CalculateMemPoolAncestors(
672-
entry, ancestors, limit_ancestor_count, limit_ancestor_size,
673-
limit_descendant_count, limit_descendant_size, unused_error_string);
673+
entry, ancestors, limits.ancestor_count, limits.ancestor_size_vbytes,
674+
limits.descendant_count, limits.descendant_size_vbytes, unused_error_string);
674675
}
675676
CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc) override
676677
{

0 commit comments

Comments
 (0)