[refactor] use CheckPackageLimits for checkChainLimits

glozow · sedited · commit 1bf4855016e7 · 2023-11-10T16:44:37.000+01:00
The behavior is the same as CalculateMemPoolAncestors. The only
difference is the string returned, and the string is discarded anyway
since checkChainLimits only cares about pass/fail.
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
@@ -703,9 +703,9 @@ class ChainImpl : public Chain
         if (!m_node.mempool) return true;
         LockPoints lp;
         CTxMemPoolEntry entry(tx, 0, 0, 0, 0, false, 0, lp);
-        const CTxMemPool::Limits& limits{m_node.mempool->m_limits};
         LOCK(m_node.mempool->cs);
-        return m_node.mempool->CalculateMemPoolAncestors(entry, limits).has_value();
+        std::string err_string;
+        return m_node.mempool->CheckPackageLimits({tx}, entry.GetTxSize(), err_string);
     }
     CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc) override
     {

Original file line number	Diff line number	Diff line change
`@@ -703,9 +703,9 @@ class ChainImpl : public Chain`
`703`	`703`	`if (!m_node.mempool) return true;`
`704`	`704`	`LockPoints lp;`
`705`	`705`	`CTxMemPoolEntry entry(tx, 0, 0, 0, 0, false, 0, lp);`
`706`		`- const CTxMemPool::Limits& limits{m_node.mempool->m_limits};`
`707`	`706`	`LOCK(m_node.mempool->cs);`
`708`		`- return m_node.mempool->CalculateMemPoolAncestors(entry, limits).has_value();`
	`707`	`+ std::string err_string;`
	`708`	`+ return m_node.mempool->CheckPackageLimits({tx}, entry.GetTxSize(), err_string);`
`709`	`709`	`}`
`710`	`710`	`CFeeRate estimateSmartFee(int num_blocks, bool conservative, FeeCalculation* calc) override`
`711`	`711`	`{`