diff --git a/src/validation.cpp b/src/validation.cpp index a56bc0548ff..4e924bc48a1 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -672,12 +672,10 @@ private: // Run checks for mempool replace-by-fee, only used in AcceptSingleTransaction. bool ReplacementChecks(Workspace& ws) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_pool.cs); - // Enforce package mempool ancestor/descendant limits (distinct from individual - // ancestor/descendant limits done in PreChecks) and run Package RBF checks. - bool PackageMempoolChecks(const std::vector& txns, - std::vector& workspaces, - int64_t total_vsize, - PackageValidationState& package_state) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_pool.cs); + bool PackageRBFChecks(const std::vector& txns, + std::vector& workspaces, + int64_t total_vsize, + PackageValidationState& package_state) EXCLUSIVE_LOCKS_REQUIRED(cs_main, m_pool.cs); // Run the script checks using our policy flags. As this can be slow, we should // only invoke this on transactions that have otherwise passed policy checks. @@ -1035,10 +1033,10 @@ bool MemPoolAccept::ReplacementChecks(Workspace& ws) return true; } -bool MemPoolAccept::PackageMempoolChecks(const std::vector& txns, - std::vector& workspaces, - const int64_t total_vsize, - PackageValidationState& package_state) +bool MemPoolAccept::PackageRBFChecks(const std::vector& txns, + std::vector& workspaces, + const int64_t total_vsize, + PackageValidationState& package_state) { AssertLockHeld(cs_main); AssertLockHeld(m_pool.cs); @@ -1470,7 +1468,7 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactionsInternal(con // needed by another transaction in the package. We also need to make sure that no package // tx replaces (or replaces the ancestor of) the parent of another package tx. As long as we // check these two things, we don't need to track the coins spent. - // If a package tx conflicts with a mempool tx, PackageMempoolChecks() ensures later that any package RBF attempt + // If a package tx conflicts with a mempool tx, PackageRBFChecks() ensures later that any package RBF attempt // has *no* in-mempool ancestors, so we don't have to worry about subsequent transactions in // same package spending the same in-mempool outpoints. This needs to be revisited for general // package RBF. @@ -1513,7 +1511,7 @@ PackageMempoolAcceptResult MemPoolAccept::AcceptMultipleTransactionsInternal(con } // Apply package mempool RBF checks. - if (m_subpackage.m_rbf && !PackageMempoolChecks(txns, workspaces, m_subpackage.m_total_vsize, package_state)) { + if (m_subpackage.m_rbf && !PackageRBFChecks(txns, workspaces, m_subpackage.m_total_vsize, package_state)) { return PackageMempoolAcceptResult(package_state, std::move(results)); }