p2p: remove unused m_is_onion member from NodeEvictionCandidate struct

jonatack · jonatack · commit 045cb40192bf · 2021-06-14T13:58:05.000+02:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -1063,7 +1063,7 @@ bool CConnman::AttemptToEvictConnection()
                                                HasAllDesirableServiceFlags(node->nServices),
                                                peer_relay_txes, peer_filter_not_null, node->nKeyedNetGroup,
                                                node->m_prefer_evict, node->addr.IsLocal(),
-                                               node->m_inbound_onion, node->ConnectedThroughNetwork()};
+                                               node->ConnectedThroughNetwork()};
             vEvictionCandidates.push_back(candidate);
         }
     }
diff --git a/src/net.h b/src/net.h
@@ -1209,7 +1209,6 @@ struct NodeEvictionCandidate
     uint64_t nKeyedNetGroup;
     bool prefer_evict;
     bool m_is_local;
-    bool m_is_onion;
     Network m_network;
 };
 
diff --git a/src/test/fuzz/node_eviction.cpp b/src/test/fuzz/node_eviction.cpp
@@ -31,7 +31,6 @@ FUZZ_TARGET(node_eviction)
             /* nKeyedNetGroup */ fuzzed_data_provider.ConsumeIntegral<uint64_t>(),
             /* prefer_evict */ fuzzed_data_provider.ConsumeBool(),
             /* m_is_local */ fuzzed_data_provider.ConsumeBool(),
-            /* m_is_onion */ fuzzed_data_provider.ConsumeBool(),
             /* m_network */ fuzzed_data_provider.PickValueInArray(ALL_NETWORKS),
         });
     }
diff --git a/src/test/net_peer_eviction_tests.cpp b/src/test/net_peer_eviction_tests.cpp
@@ -33,7 +33,6 @@ std::vector<NodeEvictionCandidate> GetRandomNodeEvictionCandidates(const int n_c
             /* nKeyedNetGroup */ random_context.randrange(100),
             /* prefer_evict */ random_context.randbool(),
             /* m_is_local */ random_context.randbool(),
-            /* m_is_onion */ random_context.randbool(),
             /* m_network */ ALL_NETWORKS[random_context.randrange(ALL_NETWORKS.size())],
         });
     }
@@ -92,7 +91,7 @@ BOOST_AUTO_TEST_CASE(peer_protection_test)
     BOOST_CHECK(IsProtected(
         num_peers, [](NodeEvictionCandidate& c) {
             c.nTimeConnected = c.id;
-            c.m_is_onion = c.m_is_local = false;
+            c.m_is_local = false;
             c.m_network = NET_IPV4;
         },
         /* protected_peer_ids */ {0, 1, 2, 3, 4, 5},
@@ -103,7 +102,7 @@ BOOST_AUTO_TEST_CASE(peer_protection_test)
     BOOST_CHECK(IsProtected(
         num_peers, [num_peers](NodeEvictionCandidate& c) {
             c.nTimeConnected = num_peers - c.id;
-            c.m_is_onion = c.m_is_local = false;
+            c.m_is_local = false;
             c.m_network = NET_IPV6;
         },
         /* protected_peer_ids */ {6, 7, 8, 9, 10, 11},
@@ -139,7 +138,6 @@ BOOST_AUTO_TEST_CASE(peer_protection_test)
     // if no onion peers.
     BOOST_CHECK(IsProtected(
         num_peers, [](NodeEvictionCandidate& c) {
-            c.m_is_onion = false;
             c.m_is_local = (c.id == 1 || c.id == 9 || c.id == 11);
             c.m_network = NET_IPV4;
         },
@@ -152,7 +150,6 @@ BOOST_AUTO_TEST_CASE(peer_protection_test)
     BOOST_CHECK(IsProtected(
         num_peers, [](NodeEvictionCandidate& c) {
             c.nTimeConnected = c.id;
-            c.m_is_onion = false;
             c.m_is_local = (c.id > 6);
             c.m_network = NET_IPV6;
         },

Original file line number	Diff line number	Diff line change
`@@ -1063,7 +1063,7 @@ bool CConnman::AttemptToEvictConnection()`
`1063`	`1063`	`HasAllDesirableServiceFlags(node->nServices),`
`1064`	`1064`	`peer_relay_txes, peer_filter_not_null, node->nKeyedNetGroup,`
`1065`	`1065`	`node->m_prefer_evict, node->addr.IsLocal(),`
`1066`		`- node->m_inbound_onion, node->ConnectedThroughNetwork()};`
	`1066`	`+ node->ConnectedThroughNetwork()};`
`1067`	`1067`	`vEvictionCandidates.push_back(candidate);`
`1068`	`1068`	`}`
`1069`	`1069`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ FUZZ_TARGET(node_eviction)`
`31`	`31`	`/* nKeyedNetGroup */ fuzzed_data_provider.ConsumeIntegral<uint64_t>(),`
`32`	`32`	`/* prefer_evict */ fuzzed_data_provider.ConsumeBool(),`
`33`	`33`	`/* m_is_local */ fuzzed_data_provider.ConsumeBool(),`
`34`		`- /* m_is_onion */ fuzzed_data_provider.ConsumeBool(),`
`35`	`34`	`/* m_network */ fuzzed_data_provider.PickValueInArray(ALL_NETWORKS),`
`36`	`35`	`});`
`37`	`36`	`}`