bitcoin/bitcoin
1
1
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-05-17 23:56:39 +00:00
Code Issues Releases Activity

node/ifaces: Use existing MemPoolLimits

Browse Source
This commit is contained in:
Carl Dong 2022-05-18 14:43:59 -04:00
parent 38af2bcf35
commit 9e93b10301
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/node/interfaces.cpp
View File

@ -653,8 +653,12 @@ public:
} }
void getPackageLimits(unsigned int& limit_ancestor_count, unsigned int& limit_descendant_count) override void getPackageLimits(unsigned int& limit_ancestor_count, unsigned int& limit_descendant_count) override
{ {
limit_ancestor_count = gArgs.GetIntArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT); const CTxMemPool::Limits default_limits{};
limit_descendant_count = gArgs.GetIntArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
const CTxMemPool::Limits& limits{m_node.mempool ? m_node.mempool->m_limits : default_limits};
limit_ancestor_count = limits.ancestor_count;
limit_descendant_count = limits.descendant_count;
} }
bool checkChainLimits(const CTransactionRef& tx) override bool checkChainLimits(const CTransactionRef& tx) override
{ {
@ -662,15 +666,12 @@ public:
LockPoints lp; LockPoints lp;
CTxMemPoolEntry entry(tx, 0, 0, 0, false, 0, lp); CTxMemPoolEntry entry(tx, 0, 0, 0, false, 0, lp);
CTxMemPool::setEntries ancestors; CTxMemPool::setEntries ancestors;
auto limit_ancestor_count = gArgs.GetIntArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT); const CTxMemPool::Limits& limits{m_node.mempool->m_limits};
auto limit_ancestor_size = gArgs.GetIntArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT_KVB) * 1000;
auto limit_descendant_count = gArgs.GetIntArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
auto limit_descendant_size = gArgs.GetIntArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT_KVB) * 1000;
std::string unused_error_string; std::string unused_error_string;
LOCK(m_node.mempool->cs); LOCK(m_node.mempool->cs);
return m_node.mempool->CalculateMemPoolAncestors( return m_node.mempool->CalculateMemPoolAncestors(
entry, ancestors, limit_ancestor_count, limit_ancestor_size, entry, ancestors, limits.ancestor_count, limits.ancestor_size_vbytes,
limit_descendant_count, limit_descendant_size, unused_error_string); limits.descendant_count, limits.descendant_size_vbytes, unused_error_string);
} }
CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc) override CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc) override
{ {