foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-08 10:31:50 -05:00
Code Issues Activity

Merge bitcoin/bitcoin#26281: docs: fix m_children to be a member of CTxMemPoolEntry

Browse source 
01bf4af4f2 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](73b61717a9/src/txmempool.h (L99)) of `CTxMemPoolEntry`, not `CTxMemPool`

ACKs for top commit:
  hebasto:
    ACK 01bf4af4f2, wrong wording was introduced in bitcoin/bitcoin#19478.
  glozow:
    ACK 01bf4af4f2

Tree-SHA512: b66c43b92fda44682b1f67c43073ca9e133a6dc03cd28253e571e67170531138c20b22ffdb08f312fb2d47a1f869b876611646b54325c8b614d12049befad578
This commit is contained in:
glozow 2022-10-09 10:16:07 -04:00
commit ec8016eba7
No known key found for this signature in database
GPG key ID: BA03F4DBE0C63FB4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/txmempool.cpp
View file

@ -145,7 +145,7 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256>& vHashes
// Iterate in reverse, so that whenever we are looking at a transaction // Iterate in reverse, so that whenever we are looking at a transaction
// we are sure that all in-mempool descendants have already been processed. // we are sure that all in-mempool descendants have already been processed.
// This maximizes the benefit of the descendant cache and guarantees that // This maximizes the benefit of the descendant cache and guarantees that
// CTxMemPool::m_children will be updated, an assumption made in // CTxMemPoolEntry::m_children will be updated, an assumption made in
// UpdateForDescendants. // UpdateForDescendants.
for (const uint256 &hash : reverse_iterate(vHashesToUpdate)) { for (const uint256 &hash : reverse_iterate(vHashesToUpdate)) {
// calculate children from mapNextTx // calculate children from mapNextTx
@ -154,7 +154,7 @@ void CTxMemPool::UpdateTransactionsFromBlock(const std::vector<uint256>& vHashes
continue; continue;
} }
auto iter = mapNextTx.lower_bound(COutPoint(hash, 0)); auto iter = mapNextTx.lower_bound(COutPoint(hash, 0));
// First calculate the children, and update CTxMemPool::m_children to // First calculate the children, and update CTxMemPoolEntry::m_children to
// include them, and update their CTxMemPoolEntry::m_parents to include this tx. // include them, and update their CTxMemPoolEntry::m_parents to include this tx.
// we cache the in-mempool children to avoid duplicate updates // we cache the in-mempool children to avoid duplicate updates
{ {

2
src/txmempool.h
View file

@ -825,7 +825,7 @@ private:
* mempool but may have child transactions in the mempool, eg during a * mempool but may have child transactions in the mempool, eg during a
* chain reorg. * chain reorg.
* *
* @pre CTxMemPool::m_children is correct for the given tx and all * @pre CTxMemPoolEntry::m_children is correct for the given tx and all
* descendants. * descendants.
* @pre cachedDescendants is an accurate cache where each entry has all * @pre cachedDescendants is an accurate cache where each entry has all
* descendants of the corresponding key, including those that should * descendants of the corresponding key, including those that should