Clean up sc-network (#9761)

* Clean up sc-network

- Avoid using clone() for the Copy type `PeerId`.
- Use `find_map` for `filter_map` and `next`.
- Use `Self`.

* More on Copy types

* Cargo +nightly fmt --all

* More ..

* fmt

* Revert vec![default_notif_handshake_message]
This commit is contained in:
Liu-Cheng Xu
2021-09-14 02:11:29 +08:00
committed by GitHub
parent 0472a43855
commit 2562f8c65e
37 changed files with 475 additions and 526 deletions
@@ -593,7 +593,7 @@ impl<N: Ord> Peers<N> {
let mut peers = self
.inner
.iter()
.map(|(peer_id, info)| (peer_id.clone(), info.clone()))
.map(|(peer_id, info)| (*peer_id, info.clone()))
.collect::<Vec<_>>();
peers.shuffle(&mut rand::thread_rng());
@@ -618,9 +618,9 @@ impl<N: Ord> Peers<N> {
let mut n_authorities_added = 0;
for peer_id in shuffled_authorities {
if n_authorities_added < half_lucky {
first_stage_peers.insert(peer_id.clone());
first_stage_peers.insert(*peer_id);
} else if n_authorities_added < one_and_a_half_lucky {
second_stage_peers.insert(peer_id.clone());
second_stage_peers.insert(*peer_id);
} else {
break
}
@@ -637,11 +637,11 @@ impl<N: Ord> Peers<N> {
}
if first_stage_peers.len() < LUCKY_PEERS {
first_stage_peers.insert(peer_id.clone());
first_stage_peers.insert(*peer_id);
second_stage_peers.remove(peer_id);
} else if second_stage_peers.len() < n_second_stage_peers {
if !first_stage_peers.contains(peer_id) {
second_stage_peers.insert(peer_id.clone());
second_stage_peers.insert(*peer_id);
}
} else {
break