diff options
author | stickies-v <stickies-v@protonmail.com> | 2022-10-09 17:19:06 +0100 |
---|---|---|
committer | stickies-v <stickies-v@protonmail.com> | 2022-12-13 15:42:49 +0000 |
commit | f911bdfff95eba3793fffaf71a31cc8bfc6f80c9 (patch) | |
tree | 3ea4d4ae42f038409ccf60af7e7c267bcc1305fa /src/policy | |
parent | 66e028f7399b6511f9b73b1cef54b6a6ac38a024 (diff) | |
download | bitcoin-f911bdfff95eba3793fffaf71a31cc8bfc6f80c9.tar.xz |
mempool: use util::Result for CalculateMemPoolAncestors
Avoid using setAncestors outparameter, simplify function signatures
and avoid creating unused dummy strings.
Diffstat (limited to 'src/policy')
-rw-r--r-- | src/policy/rbf.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp index 994e13dd56..bdaf2d0a30 100644 --- a/src/policy/rbf.cpp +++ b/src/policy/rbf.cpp @@ -16,14 +16,13 @@ #include <util/rbf.h> #include <limits> +#include <utility> #include <vector> RBFTransactionState IsRBFOptIn(const CTransaction& tx, const CTxMemPool& pool) { AssertLockHeld(pool.cs); - CTxMemPool::setEntries ancestors; - // First check the transaction itself. if (SignalsOptInRBF(tx)) { return RBFTransactionState::REPLACEABLE_BIP125; @@ -37,9 +36,9 @@ RBFTransactionState IsRBFOptIn(const CTransaction& tx, const CTxMemPool& pool) // If all the inputs have nSequence >= maxint-1, it still might be // signaled for RBF if any unconfirmed parents have signaled. - std::string dummy; CTxMemPoolEntry entry = *pool.mapTx.find(tx.GetHash()); - pool.CalculateMemPoolAncestors(entry, ancestors, CTxMemPool::Limits::NoLimits(), dummy, false); + auto ancestors_result{pool.CalculateMemPoolAncestors(entry, CTxMemPool::Limits::NoLimits(), /*fSearchForParents=*/false)}; + auto ancestors{std::move(ancestors_result).value_or(CTxMemPool::setEntries{})}; for (CTxMemPool::txiter it : ancestors) { if (SignalsOptInRBF(it->GetTx())) { |