From f1f433e8ca014f69925e8d5487877e06ca784ec8 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Wed, 4 Nov 2020 12:22:06 +0000 Subject: [PATCH] Make it easier to reason about node eviction by removing unused NodeEvictionCandidate::addr (CAddress) --- src/net.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/net.cpp b/src/net.cpp index 468358a94d..cf987b6995 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -863,7 +863,6 @@ struct NodeEvictionCandidate bool fRelevantServices; bool fRelayTxes; bool fBloomFilter; - CAddress addr; uint64_t nKeyedNetGroup; bool prefer_evict; bool m_is_local; @@ -955,7 +954,7 @@ bool CConnman::AttemptToEvictConnection() NodeEvictionCandidate candidate = {node->GetId(), node->nTimeConnected, node->nMinPingUsecTime, node->nLastBlockTime, node->nLastTXTime, HasAllDesirableServiceFlags(node->nServices), - peer_relay_txes, peer_filter_not_null, node->addr, node->nKeyedNetGroup, + peer_relay_txes, peer_filter_not_null, node->nKeyedNetGroup, node->m_prefer_evict, node->addr.IsLocal()}; vEvictionCandidates.push_back(candidate); }