Skip to content

Commit 8b79686

Browse files
committed
Merge bitcoin/bitcoin#26624: refactor: Rename local variable to distinguish it from type alias
1984db1 refactor: Rename local variable to distinguish it from type alias (Hennadii Stepanov) Pull request description: The `txiter` type alias is declared in the `txmempool.h`: https://github.com/bitcoin/bitcoin/blob/9e59d21fbe5746b220f35b0a5a735198c3e6dcdb/src/txmempool.h#L406 ACKs for top commit: stickies-v: ACK 1984db1 vasild: ACK 1984db1 jarolrod: ACK 1984db1 Tree-SHA512: 127bfb62627e2d79d8cdb0bd0ac11b3737568c3631b54b2d1e37984f673a1f60edf7bc102a269f7eb40e4bb124b910b924a89475c6a6ea978b2171219fa30685
2 parents fe8d15c + 1984db1 commit 8b79686

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/net_processing.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2298,9 +2298,9 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
22982298
std::vector<uint256> parent_ids_to_add;
22992299
{
23002300
LOCK(m_mempool.cs);
2301-
auto txiter = m_mempool.GetIter(tx->GetHash());
2302-
if (txiter) {
2303-
const CTxMemPoolEntry::Parents& parents = (*txiter)->GetMemPoolParentsConst();
2301+
auto tx_iter = m_mempool.GetIter(tx->GetHash());
2302+
if (tx_iter) {
2303+
const CTxMemPoolEntry::Parents& parents = (*tx_iter)->GetMemPoolParentsConst();
23042304
parent_ids_to_add.reserve(parents.size());
23052305
for (const CTxMemPoolEntry& parent : parents) {
23062306
if (parent.GetTime() > now - UNCONDITIONAL_RELAY_DELAY) {

0 commit comments

Comments
 (0)