diff options
author | glozow <gloriajzhao@gmail.com> | 2023-11-27 16:29:59 +0000 |
---|---|---|
committer | glozow <gloriajzhao@gmail.com> | 2024-01-16 14:20:33 +0000 |
commit | 158623b8e0726dff7eae4288138f1710e727db9c (patch) | |
tree | ce03ea05579138e8f2aa5a8241a73703a9df51d6 /src/policy/rbf.cpp | |
parent | 60f677375e52832536a599afae3226f8e2155d88 (diff) | |
download | bitcoin-158623b8e0726dff7eae4288138f1710e727db9c.tar.xz |
[refactor] change Workspace::m_conflicts and adjacent funcs/structs to use Txid
It's preferable to use type-safe transaction identifiers to avoid
confusing txid and wtxid. The next commit will add a reference to this
set; we use this opportunity to change it to Txid ahead of time instead
of adding new uses of uint256.
Diffstat (limited to 'src/policy/rbf.cpp')
-rw-r--r-- | src/policy/rbf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/policy/rbf.cpp b/src/policy/rbf.cpp index 76ab2b1a96..f0830d8f22 100644 --- a/src/policy/rbf.cpp +++ b/src/policy/rbf.cpp @@ -115,11 +115,11 @@ std::optional<std::string> HasNoNewUnconfirmed(const CTransaction& tx, } std::optional<std::string> EntriesAndTxidsDisjoint(const CTxMemPool::setEntries& ancestors, - const std::set<uint256>& direct_conflicts, + const std::set<Txid>& direct_conflicts, const uint256& txid) { for (CTxMemPool::txiter ancestorIt : ancestors) { - const uint256& hashAncestor = ancestorIt->GetTx().GetHash(); + const Txid& hashAncestor = ancestorIt->GetTx().GetHash(); if (direct_conflicts.count(hashAncestor)) { return strprintf("%s spends conflicting transaction %s", txid.ToString(), |