Fix clippy warnings (#7625)

* Fix clippy check

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Autofix clippy

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Fix trivial

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* fmt

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* suppress warnings

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Quiet clippy 😌

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
This commit is contained in:
Oliver Tale-Yazdi
2023-08-16 14:20:31 +02:00
committed by GitHub
parent a0f83eb992
commit d501d92176
51 changed files with 729 additions and 1073 deletions
@@ -148,7 +148,7 @@ fn make_gossip_topology(
assert!(all_peers.len() >= grid_size);
let peer_info = |i: usize| TopologyPeerInfo {
peer_ids: vec![all_peers[i].0.clone()],
peer_ids: vec![all_peers[i].0],
validator_index: ValidatorIndex::from(i as u32),
discovery_id: all_peers[i].1.clone(),
};
@@ -224,7 +224,7 @@ async fn setup_peer_with_view(
overseer_send(
virtual_overseer,
ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerConnected(
peer_id.clone(),
*peer_id,
ObservedRole::Full,
ValidationVersion::V1.into(),
None,
@@ -234,8 +234,7 @@ async fn setup_peer_with_view(
overseer_send(
virtual_overseer,
ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerViewChange(
peer_id.clone(),
view,
*peer_id, view,
)),
)
.await;
@@ -249,7 +248,7 @@ async fn send_message_from_peer(
overseer_send(
virtual_overseer,
ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
peer_id.clone(),
*peer_id,
Versioned::V1(msg),
)),
)
@@ -480,7 +479,7 @@ fn spam_attack_results_in_negative_reputation_change() {
// new block `hash_b` with 20 candidates
let candidates_count = 20;
let meta = BlockApprovalMeta {
hash: hash_b.clone(),
hash: hash_b,
parent_hash,
number: 2,
candidates: vec![Default::default(); candidates_count],
@@ -527,7 +526,7 @@ fn spam_attack_results_in_negative_reputation_change() {
overseer_send(
overseer,
ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerViewChange(
peer.clone(),
*peer,
View::with_finalized(2),
)),
)
@@ -587,7 +586,7 @@ fn peer_sending_us_the_same_we_just_sent_them_is_ok() {
overseer_send(
overseer,
ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerViewChange(
peer.clone(),
*peer,
view![hash],
)),
)
@@ -956,7 +955,7 @@ fn update_peer_view() {
overseer_send(
overseer,
ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerViewChange(
peer.clone(),
*peer,
View::new(vec![hash_b, hash_c, hash_d], 2),
)),
)
@@ -1009,7 +1008,7 @@ fn update_peer_view() {
overseer_send(
overseer,
ApprovalDistributionMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerViewChange(
peer.clone(),
*peer,
View::with_finalized(finalized_number),
)),
)
@@ -1166,7 +1165,7 @@ fn sends_assignments_even_when_state_is_approved() {
protocol_v1::ApprovalDistributionMessage::Assignments(sent_assignments)
))
)) => {
assert_eq!(peers, vec![peer.clone()]);
assert_eq!(peers, vec![*peer]);
assert_eq!(sent_assignments, assignments);
}
);
@@ -1179,7 +1178,7 @@ fn sends_assignments_even_when_state_is_approved() {
protocol_v1::ApprovalDistributionMessage::Approvals(sent_approvals)
))
)) => {
assert_eq!(peers, vec![peer.clone()]);
assert_eq!(peers, vec![*peer]);
assert_eq!(sent_approvals, approvals);
}
);
@@ -1208,7 +1207,7 @@ fn race_condition_in_local_vs_remote_view_update() {
// Test a small number of candidates
let candidates_count = 1;
let meta = BlockApprovalMeta {
hash: hash_b.clone(),
hash: hash_b,
parent_hash,
number: 2,
candidates: vec![Default::default(); candidates_count],
@@ -1811,7 +1810,7 @@ fn originator_aggression_l1() {
let mut state = State::default();
state.aggression_config.resend_unfinalized_period = None;
let aggression_l1_threshold = state.aggression_config.l1_threshold.clone().unwrap();
let aggression_l1_threshold = state.aggression_config.l1_threshold.unwrap();
let _ = test_harness(state, |mut virtual_overseer| async move {
let overseer = &mut virtual_overseer;
@@ -1931,8 +1930,7 @@ fn originator_aggression_l1() {
assert_eq!(sent_assignments, assignments);
assert!(unsent_indices.iter()
.find(|i| &peers[**i].0 == &sent_peers[0])
.is_some());
.any(|i| &peers[*i].0 == &sent_peers[0]));
}
);
}
@@ -1951,8 +1949,7 @@ fn originator_aggression_l1() {
assert_eq!(sent_approvals, approvals);
assert!(unsent_indices.iter()
.find(|i| &peers[**i].0 == &sent_peers[0])
.is_some());
.any(|i| &peers[*i].0 == &sent_peers[0]));
}
);
}
@@ -1972,7 +1969,7 @@ fn non_originator_aggression_l1() {
let mut state = state_without_reputation_delay();
state.aggression_config.resend_unfinalized_period = None;
let aggression_l1_threshold = state.aggression_config.l1_threshold.clone().unwrap();
let aggression_l1_threshold = state.aggression_config.l1_threshold.unwrap();
let _ = test_harness(state, |mut virtual_overseer| async move {
let overseer = &mut virtual_overseer;
@@ -2077,8 +2074,8 @@ fn non_originator_aggression_l2() {
let mut state = state_without_reputation_delay();
state.aggression_config.resend_unfinalized_period = None;
let aggression_l1_threshold = state.aggression_config.l1_threshold.clone().unwrap();
let aggression_l2_threshold = state.aggression_config.l2_threshold.clone().unwrap();
let aggression_l1_threshold = state.aggression_config.l1_threshold.unwrap();
let aggression_l2_threshold = state.aggression_config.l2_threshold.unwrap();
let _ = test_harness(state, |mut virtual_overseer| async move {
let overseer = &mut virtual_overseer;
@@ -2222,8 +2219,7 @@ fn non_originator_aggression_l2() {
assert_eq!(sent_assignments, assignments);
assert!(unsent_indices.iter()
.find(|i| &peers[**i].0 == &sent_peers[0])
.is_some());
.any(|i| &peers[*i].0 == &sent_peers[0]));
}
);
}