mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#26624: refactor: Rename local variable to distinguish it from type alias

Browse Source 
1984db1d50 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 1984db1d5
  vasild:
    ACK 1984db1d50
  jarolrod:
    ACK 1984db1d50

Tree-SHA512: 127bfb62627e2d79d8cdb0bd0ac11b3737568c3631b54b2d1e37984f673a1f60edf7bc102a269f7eb40e4bb124b910b924a89475c6a6ea978b2171219fa30685
This commit is contained in:
glozow committed 2022-12-05 11:15:41 +00:00
2 parents fe8d15c907 1984db1d50
commit 8b796866b4
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/net_processing.cpp
+3 -3
View File
@@ -2298,9 +2298,9 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
std::vector<uint256> parent_ids_to_add; std::vector<uint256> parent_ids_to_add;
{ {
LOCK(m_mempool.cs); LOCK(m_mempool.cs);
auto txiter = m_mempool.GetIter(tx->GetHash()); auto tx_iter = m_mempool.GetIter(tx->GetHash());
if (txiter) { if (tx_iter) {
const CTxMemPoolEntry::Parents& parents = (*txiter)->GetMemPoolParentsConst(); const CTxMemPoolEntry::Parents& parents = (*tx_iter)->GetMemPoolParentsConst();
parent_ids_to_add.reserve(parents.size()); parent_ids_to_add.reserve(parents.size());
for (const CTxMemPoolEntry& parent : parents) { for (const CTxMemPoolEntry& parent : parents) {
if (parent.GetTime() > now - UNCONDITIONAL_RELAY_DELAY) { if (parent.GetTime() > now - UNCONDITIONAL_RELAY_DELAY) {