Skip to content

Commit ec8016e

Browse files
committed
Merge bitcoin/bitcoin#26281: docs: fix m_children to be a member of CTxMemPoolEntry
01bf4af docs: fix m_children to be a member of CTxMemPoolEntry (stickies-v) Pull request description: Small documentation fix to reflect that `m_children` [is a member](https://github.com/bitcoin/bitcoin/blob/73b61717a977fc9d23f1bae3f8620641a9dee1f3/src/txmempool.h#L99) of `CTxMemPoolEntry`, not `CTxMemPool` ACKs for top commit: hebasto: ACK 01bf4af, wrong wording was introduced in bitcoin/bitcoin#19478. glozow: ACK 01bf4af Tree-SHA512: b66c43b92fda44682b1f67c43073ca9e133a6dc03cd28253e571e67170531138c20b22ffdb08f312fb2d47a1f869b876611646b54325c8b614d12049befad578
2 parents 73b6171 + 01bf4af commit ec8016e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/txmempool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256>& vHashes
145145
// Iterate in reverse, so that whenever we are looking at a transaction
146146
// we are sure that all in-mempool descendants have already been processed.
147147
// This maximizes the benefit of the descendant cache and guarantees that
148-
// CTxMemPool::m_children will be updated, an assumption made in
148+
// CTxMemPoolEntry::m_children will be updated, an assumption made in
149149
// UpdateForDescendants.
150150
for (const uint256 &hash : reverse_iterate(vHashesToUpdate)) {
151151
// calculate children from mapNextTx
@@ -154,7 +154,7 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256>& vHashes
154154
continue;
155155
}
156156
auto iter = mapNextTx.lower_bound(COutPoint(hash, 0));
157-
// First calculate the children, and update CTxMemPool::m_children to
157+
// First calculate the children, and update CTxMemPoolEntry::m_children to
158158
// include them, and update their CTxMemPoolEntry::m_parents to include this tx.
159159
// we cache the in-mempool children to avoid duplicate updates
160160
{

src/txmempool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ class CTxMemPool
825825
* mempool but may have child transactions in the mempool, eg during a
826826
* chain reorg.
827827
*
828-
* @pre CTxMemPool::m_children is correct for the given tx and all
828+
* @pre CTxMemPoolEntry::m_children is correct for the given tx and all
829829
* descendants.
830830
* @pre cachedDescendants is an accurate cache where each entry has all
831831
* descendants of the corresponding key, including those that should

0 commit comments

Comments
 (0)