aboutsummaryrefslogtreecommitdiff
path: root/src/policy/rbf.cpp
diff options
context:
space:
mode:
authorglozow <gloriajzhao@gmail.com>2021-09-02 15:27:37 +0100
committerglozow <gloriajzhao@gmail.com>2021-09-02 16:23:25 +0100
commitf8ad2a57c61d1e817e2445226688e03080fc8688 (patch)
tree2c10a7d397abd8aa7173c51f9064d02959cdc149 /src/policy/rbf.cpp
parentb3a2b8c29fda5d924726d3087535bd34af7012b6 (diff)
Make GetEntriesForConflicts return std::optional
Avoids reusing err_string.
Diffstat (limited to 'src/policy/rbf.cpp')
-rw-r--r--src/policy/rbf.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp
index 43624c7993..3ff4c1f9c2 100644
--- a/src/policy/rbf.cpp
+++ b/src/policy/rbf.cpp
@@ -47,11 +47,10 @@ RBFTransactionState IsRBFOptInEmptyMempool(const CTransaction& tx)
return SignalsOptInRBF(tx) ? RBFTransactionState::REPLACEABLE_BIP125 : RBFTransactionState::UNKNOWN;
}
-bool GetEntriesForConflicts(const CTransaction& tx,
+std::optional<std::string> GetEntriesForConflicts(const CTransaction& tx,
CTxMemPool& m_pool,
const CTxMemPool::setEntries& setIterConflicting,
- CTxMemPool::setEntries& allConflicting,
- std::string& err_string)
+ CTxMemPool::setEntries& allConflicting)
{
AssertLockHeld(m_pool.cs);
const uint256 hash = tx.GetHash();
@@ -62,11 +61,10 @@ bool GetEntriesForConflicts(const CTransaction& tx,
// but we just want to be conservative to avoid doing too much
// work.
if (nConflictingCount > MAX_BIP125_REPLACEMENT_CANDIDATES) {
- err_string = strprintf("rejecting replacement %s; too many potential replacements (%d > %d)\n",
+ return strprintf("rejecting replacement %s; too many potential replacements (%d > %d)\n",
hash.ToString(),
nConflictingCount,
MAX_BIP125_REPLACEMENT_CANDIDATES);
- return false;
}
}
// If not too many to replace, then calculate the set of
@@ -74,6 +72,6 @@ bool GetEntriesForConflicts(const CTransaction& tx,
for (CTxMemPool::txiter it : setIterConflicting) {
m_pool.CalculateDescendants(it, allConflicting);
}
- return true;
+ return std::nullopt;
}