diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-05 13:00:10 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-05 13:00:13 +0100 |
| commit | d94777bd525a06abac74cd1508ddb845faf1d118 (patch) | |
| tree | 10e5be677169a55c80054310fd9cb0ed3d28fc1d /src | |
| parent | f33e3325417988711476fd4703ac013d13a5de46 (diff) | |
| parent | f1f433e8ca014f69925e8d5487877e06ca784ec8 (diff) | |
| download | bitcoin-d94777bd525a06abac74cd1508ddb845faf1d118.tar.xz | |
Merge #20302: net: Make it easier to reason about node eviction by removing unused NodeEvictionCandidate::addr (CAddress)
f1f433e8ca014f69925e8d5487877e06ca784ec8 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 f1f433e8ca014f69925e8d5487877e06ca784ec8
Tree-SHA512: fef91d7b412b8a4f172370cff6c37eb8c3db0ba618f5daf2dcc8737c8fcef7b9b820d7ee99cd0a9eae7dd653a096cf83d5113776b0d1d9a324147581674e9ede
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.cpp | 3 |
1 files changed, 1 insertions, 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); } |