Skip to content

Commit d94777b

Browse files
author
MarcoFalke
committed
Merge bitcoin#20302: net: Make it easier to reason about node eviction by removing unused NodeEvictionCandidate::addr (CAddress)
f1f433e Make it easier to reason about node eviction by removing unused NodeEvictionCandidate::addr (CAddress) (practicalswift) Pull request description: Make it easier to reason about node eviction by removing unused `NodeEvictionCandidate::addr` (`CAddress`). ACKs for top commit: jnewbery: utACK f1f433e Tree-SHA512: fef91d7b412b8a4f172370cff6c37eb8c3db0ba618f5daf2dcc8737c8fcef7b9b820d7ee99cd0a9eae7dd653a096cf83d5113776b0d1d9a324147581674e9ede
2 parents f33e332 + f1f433e commit d94777b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/net.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,6 @@ struct NodeEvictionCandidate
863863
bool fRelevantServices;
864864
bool fRelayTxes;
865865
bool fBloomFilter;
866-
CAddress addr;
867866
uint64_t nKeyedNetGroup;
868867
bool prefer_evict;
869868
bool m_is_local;
@@ -955,7 +954,7 @@ bool CConnman::AttemptToEvictConnection()
955954
NodeEvictionCandidate candidate = {node->GetId(), node->nTimeConnected, node->nMinPingUsecTime,
956955
node->nLastBlockTime, node->nLastTXTime,
957956
HasAllDesirableServiceFlags(node->nServices),
958-
peer_relay_txes, peer_filter_not_null, node->addr, node->nKeyedNetGroup,
957+
peer_relay_txes, peer_filter_not_null, node->nKeyedNetGroup,
959958
node->m_prefer_evict, node->addr.IsLocal()};
960959
vEvictionCandidates.push_back(candidate);
961960
}

0 commit comments

Comments
 (0)