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>

polkadot/node/network/approval-distribution/src/tests.rs

@@ -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]));
 				}
 			);
 		}

polkadot/node/network/availability-distribution/src/tests/state.rs

@@ -123,13 +123,13 @@ impl Default for TestState {
 						let (core, chunk) = OccupiedCoreBuilder {
 							group_responsible: GroupIndex(i as _),
 							para_id: *para_id,
-							relay_parent: relay_parent.clone(),
+							relay_parent: *relay_parent,
 						}
 						.build();
 						(CoreState::Occupied(core), chunk)
 					})
 					.unzip();
-				cores.insert(relay_child.clone(), p_cores);
+				cores.insert(*relay_child, p_cores);
 				// Skip chunks for our own group (won't get fetched):
 				let mut chunks_other_groups = p_chunks.into_iter();
 				chunks_other_groups.next();
@@ -176,12 +176,12 @@ impl TestState {
 				.zip(advanced)
 				.map(|(old, new)| ActiveLeavesUpdate {
 					activated: Some(ActivatedLeaf {
-						hash: new.clone(),
+						hash: *new,
 						number: 1,
 						status: LeafStatus::Fresh,
 						span: Arc::new(jaeger::Span::Disabled),
 					}),
-					deactivated: vec![old.clone()].into(),
+					deactivated: vec![*old].into(),
 				})
 				.collect::<Vec<_>>()
 		};
@@ -239,8 +239,7 @@ impl TestState {
 					let chunk = self
 						.chunks
 						.get_mut(&(candidate_hash, validator_index))
-						.map(Vec::pop)
-						.flatten()
+						.and_then(Vec::pop)
 						.flatten();
 					tx.send(chunk).expect("Receiver is expected to be alive");
 				},

polkadot/node/network/availability-recovery/src/tests.rs

@@ -562,7 +562,7 @@ fn availability_is_recovered_from_chunks_if_no_group_provided() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -648,7 +648,7 @@ fn availability_is_recovered_from_chunks_even_if_backing_group_supplied_if_chunk
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -734,7 +734,7 @@ fn bad_merkle_path_leads_to_recovery_error() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -792,7 +792,7 @@ fn wrong_chunk_index_leads_to_recovery_error() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -866,7 +866,7 @@ fn invalid_erasure_coding_leads_to_invalid_error() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -915,7 +915,7 @@ fn fast_path_backing_group_recovers() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -965,7 +965,7 @@ fn recovers_from_only_chunks_if_pov_large() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1069,7 +1069,7 @@ fn fast_path_backing_group_recovers_if_pov_small() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1128,7 +1128,7 @@ fn no_answers_in_fast_path_causes_chunk_requests() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1190,7 +1190,7 @@ fn task_canceled_when_receivers_dropped() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1232,7 +1232,7 @@ fn chunks_retry_until_all_nodes_respond() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1293,7 +1293,7 @@ fn not_returning_requests_wont_stall_retrieval() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1365,7 +1365,7 @@ fn all_not_returning_requests_still_recovers_on_return() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1442,7 +1442,7 @@ fn returns_early_if_we_have_the_data() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1479,7 +1479,7 @@ fn does_not_query_local_validator() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),
@@ -1538,7 +1538,7 @@ fn invalid_local_chunk_is_ignored() {
 		overseer_signal(
 			&mut virtual_overseer,
 			OverseerSignal::ActiveLeaves(ActiveLeavesUpdate::start_work(ActivatedLeaf {
-				hash: test_state.current.clone(),
+				hash: test_state.current,
 				number: 1,
 				status: LeafStatus::Fresh,
 				span: Arc::new(jaeger::Span::Disabled),

polkadot/node/network/bitfield-distribution/src/tests.rs

@@ -65,7 +65,7 @@ fn prewarmed_state(
 	known_message: BitfieldGossipMessage,
 	peers: Vec<PeerId>,
 ) -> ProtocolState {
-	let relay_parent = known_message.relay_parent.clone();
+	let relay_parent = known_message.relay_parent;
 	let mut topologies = SessionBoundGridTopologyStorage::default();
 	topologies.update_topology(0_u32, SessionGridTopology::new(Vec::new(), Vec::new()), None);
 	topologies.get_current_topology_mut().local_grid_neighbors_mut().peers_x =
@@ -73,7 +73,7 @@ fn prewarmed_state(
 
 	ProtocolState {
 		per_relay_parent: hashmap! {
-			relay_parent.clone() =>
+			relay_parent =>
 				PerRelayParentData {
 					signing_context,
 					validator_set: vec![validator.clone()],
@@ -99,7 +99,7 @@ fn state_with_view(
 ) -> (ProtocolState, SigningContext, KeystorePtr, ValidatorId) {
 	let mut state = ProtocolState { reputation, ..Default::default() };
 
-	let signing_context = SigningContext { session_index: 1, parent_hash: relay_parent.clone() };
+	let signing_context = SigningContext { session_index: 1, parent_hash: relay_parent };
 
 	let keystore: KeystorePtr = Arc::new(MemoryKeystore::new());
 	let validator = Keystore::sr25519_generate_new(&*keystore, ValidatorId::ID, None)
@@ -109,10 +109,10 @@ fn state_with_view(
 		.iter()
 		.map(|relay_parent| {
 			(
-				relay_parent.clone(),
+				*relay_parent,
 				PerRelayParentData {
 					signing_context: signing_context.clone(),
-					validator_set: vec![validator.clone().into()],
+					validator_set: vec![validator.into()],
 					one_per_validator: hashmap! {},
 					message_received_from_peer: hashmap! {},
 					message_sent_to_peer: hashmap! {},
@@ -140,7 +140,7 @@ fn receive_invalid_signature() {
 	let peer_b = PeerId::random();
 	assert_ne!(peer_a, peer_b);
 
-	let signing_context = SigningContext { session_index: 1, parent_hash: hash_a.clone() };
+	let signing_context = SigningContext { session_index: 1, parent_hash: hash_a };
 
 	// another validator not part of the validatorset
 	let keystore: KeystorePtr = Arc::new(MemoryKeystore::new());
@@ -184,28 +184,20 @@ fn receive_invalid_signature() {
 	.flatten()
 	.expect("should be signed");
 
-	let invalid_msg = BitfieldGossipMessage {
-		relay_parent: hash_a.clone(),
-		signed_availability: invalid_signed.clone(),
-	};
+	let invalid_msg =
+		BitfieldGossipMessage { relay_parent: hash_a, signed_availability: invalid_signed.clone() };
 	let invalid_msg_2 = BitfieldGossipMessage {
-		relay_parent: hash_a.clone(),
+		relay_parent: hash_a,
 		signed_availability: invalid_signed_2.clone(),
 	};
-	let valid_msg = BitfieldGossipMessage {
-		relay_parent: hash_a.clone(),
-		signed_availability: valid_signed.clone(),
-	};
+	let valid_msg =
+		BitfieldGossipMessage { relay_parent: hash_a, signed_availability: valid_signed.clone() };
 
 	let pool = sp_core::testing::TaskExecutor::new();
 	let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
 
-	let mut state = prewarmed_state(
-		validator_0.into(),
-		signing_context.clone(),
-		valid_msg,
-		vec![peer_b.clone()],
-	);
+	let mut state =
+		prewarmed_state(validator_0.into(), signing_context.clone(), valid_msg, vec![peer_b]);
 	state
 		.per_relay_parent
 		.get_mut(&hash_a)
@@ -219,7 +211,7 @@ fn receive_invalid_signature() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), invalid_msg.into_network_message()),
+			NetworkBridgeEvent::PeerMessage(peer_b, invalid_msg.into_network_message()),
 			&mut rng,
 		));
 
@@ -230,7 +222,7 @@ fn receive_invalid_signature() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), invalid_msg_2.into_network_message()),
+			NetworkBridgeEvent::PeerMessage(peer_b, invalid_msg_2.into_network_message()),
 			&mut rng,
 		));
 		// reputation change due to invalid signature
@@ -261,13 +253,10 @@ fn receive_invalid_validator_index() {
 	assert_ne!(peer_a, peer_b);
 
 	// validator 0 key pair
-	let (mut state, signing_context, keystore, validator) = state_with_view(
-		our_view![hash_a, hash_b],
-		hash_a.clone(),
-		ReputationAggregator::new(|_| true),
-	);
+	let (mut state, signing_context, keystore, validator) =
+		state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| true));
 
-	state.peer_views.insert(peer_b.clone(), view![hash_a]);
+	state.peer_views.insert(peer_b, view![hash_a]);
 
 	let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
 	let signed = Signed::<AvailabilityBitfield>::sign(
@@ -281,8 +270,7 @@ fn receive_invalid_validator_index() {
 	.flatten()
 	.expect("should be signed");
 
-	let msg =
-		BitfieldGossipMessage { relay_parent: hash_a.clone(), signed_availability: signed.clone() };
+	let msg = BitfieldGossipMessage { relay_parent: hash_a, signed_availability: signed.clone() };
 
 	let pool = sp_core::testing::TaskExecutor::new();
 	let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
@@ -293,7 +281,7 @@ fn receive_invalid_validator_index() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.into_network_message()),
+			NetworkBridgeEvent::PeerMessage(peer_b, msg.into_network_message()),
 			&mut rng,
 		));
 
@@ -325,11 +313,8 @@ fn receive_duplicate_messages() {
 	assert_ne!(peer_a, peer_b);
 
 	// validator 0 key pair
-	let (mut state, signing_context, keystore, validator) = state_with_view(
-		our_view![hash_a, hash_b],
-		hash_a.clone(),
-		ReputationAggregator::new(|_| true),
-	);
+	let (mut state, signing_context, keystore, validator) =
+		state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| true));
 
 	// create a signed message by validator 0
 	let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
@@ -345,7 +330,7 @@ fn receive_duplicate_messages() {
 	.expect("should be signed");
 
 	let msg = BitfieldGossipMessage {
-		relay_parent: hash_a.clone(),
+		relay_parent: hash_a,
 		signed_availability: signed_bitfield.clone(),
 	};
 
@@ -359,7 +344,7 @@ fn receive_duplicate_messages() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -392,7 +377,7 @@ fn receive_duplicate_messages() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_a.clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peer_a, msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -411,7 +396,7 @@ fn receive_duplicate_messages() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -442,11 +427,8 @@ fn delay_reputation_change() {
 	let peer = PeerId::random();
 
 	// validator 0 key pair
-	let (mut state, signing_context, keystore, validator) = state_with_view(
-		our_view![hash_a, hash_b],
-		hash_a.clone(),
-		ReputationAggregator::new(|_| false),
-	);
+	let (mut state, signing_context, keystore, validator) =
+		state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| false));
 
 	// create a signed message by validator 0
 	let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
@@ -462,7 +444,7 @@ fn delay_reputation_change() {
 	.expect("should be signed");
 
 	let msg = BitfieldGossipMessage {
-		relay_parent: hash_a.clone(),
+		relay_parent: hash_a,
 		signed_availability: signed_bitfield.clone(),
 	};
 
@@ -481,10 +463,7 @@ fn delay_reputation_change() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: BitfieldDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerMessage(
-						peer.clone(),
-						msg.clone().into_network_message(),
-					),
+					NetworkBridgeEvent::PeerMessage(peer, msg.clone().into_network_message()),
 				),
 			})
 			.await;
@@ -507,10 +486,7 @@ fn delay_reputation_change() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: BitfieldDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerMessage(
-						peer.clone(),
-						msg.clone().into_network_message(),
-					),
+					NetworkBridgeEvent::PeerMessage(peer, msg.clone().into_network_message()),
 				),
 			})
 			.await;
@@ -555,7 +531,7 @@ fn do_not_relay_message_twice() {
 
 	// validator 0 key pair
 	let (mut state, signing_context, keystore, validator) =
-		state_with_view(our_view![hash], hash.clone(), ReputationAggregator::new(|_| true));
+		state_with_view(our_view![hash], hash, ReputationAggregator::new(|_| true));
 
 	// create a signed message by validator 0
 	let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
@@ -570,13 +546,11 @@ fn do_not_relay_message_twice() {
 	.flatten()
 	.expect("should be signed");
 
-	state.peer_views.insert(peer_b.clone(), view![hash]);
-	state.peer_views.insert(peer_a.clone(), view![hash]);
+	state.peer_views.insert(peer_b, view![hash]);
+	state.peer_views.insert(peer_a, view![hash]);
 
-	let msg = BitfieldGossipMessage {
-		relay_parent: hash.clone(),
-		signed_availability: signed_bitfield.clone(),
-	};
+	let msg =
+		BitfieldGossipMessage { relay_parent: hash, signed_availability: signed_bitfield.clone() };
 
 	let pool = sp_core::testing::TaskExecutor::new();
 	let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
@@ -584,7 +558,7 @@ fn do_not_relay_message_twice() {
 
 	executor::block_on(async move {
 		let mut gossip_peers = GridNeighbors::empty();
-		gossip_peers.peers_x = HashSet::from_iter(vec![peer_a.clone(), peer_b.clone()].into_iter());
+		gossip_peers.peers_x = HashSet::from_iter(vec![peer_a, peer_b].into_iter());
 
 		relay_message(
 			&mut ctx,
@@ -665,11 +639,8 @@ fn changing_view() {
 	assert_ne!(peer_a, peer_b);
 
 	// validator 0 key pair
-	let (mut state, signing_context, keystore, validator) = state_with_view(
-		our_view![hash_a, hash_b],
-		hash_a.clone(),
-		ReputationAggregator::new(|_| true),
-	);
+	let (mut state, signing_context, keystore, validator) =
+		state_with_view(our_view![hash_a, hash_b], hash_a, ReputationAggregator::new(|_| true));
 
 	// create a signed message by validator 0
 	let payload = AvailabilityBitfield(bitvec![u8, bitvec::order::Lsb0; 1u8; 32]);
@@ -685,7 +656,7 @@ fn changing_view() {
 	.expect("should be signed");
 
 	let msg = BitfieldGossipMessage {
-		relay_parent: hash_a.clone(),
+		relay_parent: hash_a,
 		signed_availability: signed_bitfield.clone(),
 	};
 
@@ -699,7 +670,7 @@ fn changing_view() {
 			&mut state,
 			&Default::default(),
 			NetworkBridgeEvent::PeerConnected(
-				peer_b.clone(),
+				peer_b,
 				ObservedRole::Full,
 				ValidationVersion::V1.into(),
 				None
@@ -712,7 +683,7 @@ fn changing_view() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![hash_a, hash_b]),
+			NetworkBridgeEvent::PeerViewChange(peer_b, view![hash_a, hash_b]),
 			&mut rng,
 		));
 
@@ -723,7 +694,7 @@ fn changing_view() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -754,7 +725,7 @@ fn changing_view() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![]),
+			NetworkBridgeEvent::PeerViewChange(peer_b, view![]),
 			&mut rng,
 		));
 
@@ -767,7 +738,7 @@ fn changing_view() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -786,7 +757,7 @@ fn changing_view() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerDisconnected(peer_b.clone()),
+			NetworkBridgeEvent::PeerDisconnected(peer_b),
 			&mut rng,
 		));
 
@@ -799,7 +770,7 @@ fn changing_view() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_a.clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peer_a, msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -846,13 +817,11 @@ fn do_not_send_message_back_to_origin() {
 	.flatten()
 	.expect("should be signed");
 
-	state.peer_views.insert(peer_b.clone(), view![hash]);
-	state.peer_views.insert(peer_a.clone(), view![hash]);
+	state.peer_views.insert(peer_b, view![hash]);
+	state.peer_views.insert(peer_a, view![hash]);
 
-	let msg = BitfieldGossipMessage {
-		relay_parent: hash.clone(),
-		signed_availability: signed_bitfield.clone(),
-	};
+	let msg =
+		BitfieldGossipMessage { relay_parent: hash, signed_availability: signed_bitfield.clone() };
 
 	let pool = sp_core::testing::TaskExecutor::new();
 	let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
@@ -864,7 +833,7 @@ fn do_not_send_message_back_to_origin() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peer_b.clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peer_b, msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -930,13 +899,13 @@ fn topology_test() {
 	let peers_x: Vec<_> = [0, 2, 3, 4, 5, 6]
 		.iter()
 		.cloned()
-		.map(|i| topology_peer_info[i].peer_ids[0].clone())
+		.map(|i| topology_peer_info[i].peer_ids[0])
 		.collect();
 
 	let peers_y: Vec<_> = [8, 15, 22, 29, 36, 43]
 		.iter()
 		.cloned()
-		.map(|i| topology_peer_info[i].peer_ids[0].clone())
+		.map(|i| topology_peer_info[i].peer_ids[0])
 		.collect();
 
 	{
@@ -963,13 +932,11 @@ fn topology_test() {
 	.expect("should be signed");
 
 	peers_x.iter().chain(peers_y.iter()).for_each(|peer| {
-		state.peer_views.insert(peer.clone(), view![hash]);
+		state.peer_views.insert(*peer, view![hash]);
 	});
 
-	let msg = BitfieldGossipMessage {
-		relay_parent: hash.clone(),
-		signed_availability: signed_bitfield.clone(),
-	};
+	let msg =
+		BitfieldGossipMessage { relay_parent: hash, signed_availability: signed_bitfield.clone() };
 
 	let pool = sp_core::testing::TaskExecutor::new();
 	let (mut ctx, mut handle) = make_subsystem_context::<BitfieldDistributionMessage, _>(pool);
@@ -981,7 +948,7 @@ fn topology_test() {
 			&mut ctx,
 			&mut state,
 			&Default::default(),
-			NetworkBridgeEvent::PeerMessage(peers_x[0].clone(), msg.clone().into_network_message(),),
+			NetworkBridgeEvent::PeerMessage(peers_x[0], msg.clone().into_network_message(),),
 			&mut rng,
 		));
 
@@ -1064,22 +1031,22 @@ fn need_message_works() {
 				.insert(signed_by.clone());
 		};
 
-	assert!(true == pretend_send(&mut state, peer_a, &validator_set[0]));
-	assert!(true == pretend_send(&mut state, peer_b, &validator_set[1]));
+	assert!(pretend_send(&mut state, peer_a, &validator_set[0]));
+	assert!(pretend_send(&mut state, peer_b, &validator_set[1]));
 	// sending the same thing must not be allowed
-	assert!(false == pretend_send(&mut state, peer_a, &validator_set[0]));
+	assert!(!pretend_send(&mut state, peer_a, &validator_set[0]));
 
 	// receive by Alice
 	pretend_receive(&mut state, peer_a, &validator_set[0]);
 	// must be marked as not needed by Alice, so attempt to send to Alice must be false
-	assert!(false == pretend_send(&mut state, peer_a, &validator_set[0]));
+	assert!(!pretend_send(&mut state, peer_a, &validator_set[0]));
 	// but ok for Bob
-	assert!(false == pretend_send(&mut state, peer_b, &validator_set[1]));
+	assert!(!pretend_send(&mut state, peer_b, &validator_set[1]));
 
 	// receive by Bob
 	pretend_receive(&mut state, peer_a, &validator_set[0]);
 	// not ok for Alice
-	assert!(false == pretend_send(&mut state, peer_a, &validator_set[0]));
+	assert!(!pretend_send(&mut state, peer_a, &validator_set[0]));
 	// also not ok for Bob
-	assert!(false == pretend_send(&mut state, peer_b, &validator_set[1]));
+	assert!(!pretend_send(&mut state, peer_b, &validator_set[1]));
 }

polkadot/node/network/bridge/src/rx/tests.rs

@@ -432,12 +432,8 @@ fn send_our_view_upon_connection() {
 
 		handle.await_mode_switch().await;
 
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Validation, ObservedRole::Full)
-			.await;
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Collation, ObservedRole::Full)
-			.await;
+		network_handle.connect_peer(peer, PeerSet::Validation, ObservedRole::Full).await;
+		network_handle.connect_peer(peer, PeerSet::Collation, ObservedRole::Full).await;
 
 		await_peer_connections(&shared, 1, 1).await;
 
@@ -446,7 +442,7 @@ fn send_our_view_upon_connection() {
 		assert_network_actions_contains(
 			&actions,
 			&NetworkAction::WriteNotification(
-				peer.clone(),
+				peer,
 				PeerSet::Validation,
 				WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(view.clone()).encode(),
 			),
@@ -454,7 +450,7 @@ fn send_our_view_upon_connection() {
 		assert_network_actions_contains(
 			&actions,
 			&NetworkAction::WriteNotification(
-				peer.clone(),
+				peer,
 				PeerSet::Collation,
 				WireMessage::<protocol_v1::CollationProtocol>::ViewUpdate(view.clone()).encode(),
 			),
@@ -482,10 +478,10 @@ fn sends_view_updates_to_peers() {
 		handle.await_mode_switch().await;
 
 		network_handle
-			.connect_peer(peer_a.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer_a, PeerSet::Validation, ObservedRole::Full)
 			.await;
 		network_handle
-			.connect_peer(peer_b.clone(), PeerSet::Collation, ObservedRole::Full)
+			.connect_peer(peer_b, PeerSet::Collation, ObservedRole::Full)
 			.await;
 
 		await_peer_connections(&shared, 1, 1).await;
@@ -545,10 +541,10 @@ fn do_not_send_view_update_until_synced() {
 		assert_ne!(peer_a, peer_b);
 
 		network_handle
-			.connect_peer(peer_a.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer_a, PeerSet::Validation, ObservedRole::Full)
 			.await;
 		network_handle
-			.connect_peer(peer_b.clone(), PeerSet::Collation, ObservedRole::Full)
+			.connect_peer(peer_b, PeerSet::Collation, ObservedRole::Full)
 			.await;
 
 		await_peer_connections(&shared, 1, 1).await;
@@ -640,10 +636,10 @@ fn do_not_send_view_update_when_only_finalized_block_changed() {
 		let peer_b = PeerId::random();
 
 		network_handle
-			.connect_peer(peer_a.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer_a, PeerSet::Validation, ObservedRole::Full)
 			.await;
 		network_handle
-			.connect_peer(peer_b.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer_b, PeerSet::Validation, ObservedRole::Full)
 			.await;
 
 		await_peer_connections(&shared, 2, 0).await;
@@ -700,9 +696,7 @@ fn peer_view_updates_sent_via_overseer() {
 
 		let peer = PeerId::random();
 
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Validation, ObservedRole::Full)
-			.await;
+		network_handle.connect_peer(peer, PeerSet::Validation, ObservedRole::Full).await;
 
 		await_peer_connections(&shared, 1, 0).await;
 
@@ -712,7 +706,7 @@ fn peer_view_updates_sent_via_overseer() {
 		{
 			assert_sends_validation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer.clone(),
+					peer,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -722,7 +716,7 @@ fn peer_view_updates_sent_via_overseer() {
 			.await;
 
 			assert_sends_validation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
@@ -730,14 +724,14 @@ fn peer_view_updates_sent_via_overseer() {
 
 		network_handle
 			.peer_message(
-				peer.clone(),
+				peer,
 				PeerSet::Validation,
 				WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(view.clone()).encode(),
 			)
 			.await;
 
 		assert_sends_validation_event_to_all(
-			NetworkBridgeEvent::PeerViewChange(peer.clone(), view),
+			NetworkBridgeEvent::PeerViewChange(peer, view),
 			&mut virtual_overseer,
 		)
 		.await;
@@ -752,9 +746,7 @@ fn peer_messages_sent_via_overseer() {
 
 		let peer = PeerId::random();
 
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Validation, ObservedRole::Full)
-			.await;
+		network_handle.connect_peer(peer, PeerSet::Validation, ObservedRole::Full).await;
 
 		await_peer_connections(&shared, 1, 0).await;
 
@@ -762,7 +754,7 @@ fn peer_messages_sent_via_overseer() {
 		{
 			assert_sends_validation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer.clone(),
+					peer,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -772,7 +764,7 @@ fn peer_messages_sent_via_overseer() {
 			.await;
 
 			assert_sends_validation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
@@ -787,13 +779,13 @@ fn peer_messages_sent_via_overseer() {
 
 		network_handle
 			.peer_message(
-				peer.clone(),
+				peer,
 				PeerSet::Validation,
 				WireMessage::ProtocolMessage(message_v1.clone()).encode(),
 			)
 			.await;
 
-		network_handle.disconnect_peer(peer.clone(), PeerSet::Validation).await;
+		network_handle.disconnect_peer(peer, PeerSet::Validation).await;
 
 		// Approval distribution message comes first, and the message is only sent to that
 		// subsystem. then a disconnection event arises that is sent to all validation networking
@@ -827,12 +819,8 @@ fn peer_disconnect_from_just_one_peerset() {
 
 		let peer = PeerId::random();
 
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Validation, ObservedRole::Full)
-			.await;
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Collation, ObservedRole::Full)
-			.await;
+		network_handle.connect_peer(peer, PeerSet::Validation, ObservedRole::Full).await;
+		network_handle.connect_peer(peer, PeerSet::Collation, ObservedRole::Full).await;
 
 		await_peer_connections(&shared, 1, 1).await;
 
@@ -840,7 +828,7 @@ fn peer_disconnect_from_just_one_peerset() {
 		{
 			assert_sends_validation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer.clone(),
+					peer,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -850,7 +838,7 @@ fn peer_disconnect_from_just_one_peerset() {
 			.await;
 
 			assert_sends_validation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
@@ -859,7 +847,7 @@ fn peer_disconnect_from_just_one_peerset() {
 		{
 			assert_sends_collation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer.clone(),
+					peer,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -869,16 +857,16 @@ fn peer_disconnect_from_just_one_peerset() {
 			.await;
 
 			assert_sends_collation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
 		}
 
-		network_handle.disconnect_peer(peer.clone(), PeerSet::Validation).await;
+		network_handle.disconnect_peer(peer, PeerSet::Validation).await;
 
 		assert_sends_validation_event_to_all(
-			NetworkBridgeEvent::PeerDisconnected(peer.clone()),
+			NetworkBridgeEvent::PeerDisconnected(peer),
 			&mut virtual_overseer,
 		)
 		.await;
@@ -904,11 +892,7 @@ fn peer_disconnect_from_just_one_peerset() {
 
 		assert_network_actions_contains(
 			&actions,
-			&NetworkAction::WriteNotification(
-				peer.clone(),
-				PeerSet::Collation,
-				wire_message.clone(),
-			),
+			&NetworkAction::WriteNotification(peer, PeerSet::Collation, wire_message.clone()),
 		);
 		virtual_overseer
 	});
@@ -923,10 +907,10 @@ fn relays_collation_protocol_messages() {
 		let peer_b = PeerId::random();
 
 		network_handle
-			.connect_peer(peer_a.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer_a, PeerSet::Validation, ObservedRole::Full)
 			.await;
 		network_handle
-			.connect_peer(peer_b.clone(), PeerSet::Collation, ObservedRole::Full)
+			.connect_peer(peer_b, PeerSet::Collation, ObservedRole::Full)
 			.await;
 
 		await_peer_connections(&shared, 1, 1).await;
@@ -935,7 +919,7 @@ fn relays_collation_protocol_messages() {
 		{
 			assert_sends_validation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer_a.clone(),
+					peer_a,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -945,7 +929,7 @@ fn relays_collation_protocol_messages() {
 			.await;
 
 			assert_sends_validation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer_a.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer_a, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
@@ -954,7 +938,7 @@ fn relays_collation_protocol_messages() {
 		{
 			assert_sends_collation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer_b.clone(),
+					peer_b,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -964,7 +948,7 @@ fn relays_collation_protocol_messages() {
 			.await;
 
 			assert_sends_collation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer_b.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer_b, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
@@ -983,7 +967,7 @@ fn relays_collation_protocol_messages() {
 
 		network_handle
 			.peer_message(
-				peer_a.clone(),
+				peer_a,
 				PeerSet::Collation,
 				WireMessage::ProtocolMessage(message_v1.clone()).encode(),
 			)
@@ -992,14 +976,14 @@ fn relays_collation_protocol_messages() {
 		let actions = network_handle.next_network_actions(3).await;
 		assert_network_actions_contains(
 			&actions,
-			&NetworkAction::ReputationChange(peer_a.clone(), UNCONNECTED_PEERSET_COST.into()),
+			&NetworkAction::ReputationChange(peer_a, UNCONNECTED_PEERSET_COST.into()),
 		);
 
 		// peer B has the message relayed.
 
 		network_handle
 			.peer_message(
-				peer_b.clone(),
+				peer_b,
 				PeerSet::Collation,
 				WireMessage::ProtocolMessage(message_v1.clone()).encode(),
 			)
@@ -1027,12 +1011,8 @@ fn different_views_on_different_peer_sets() {
 
 		let peer = PeerId::random();
 
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Validation, ObservedRole::Full)
-			.await;
-		network_handle
-			.connect_peer(peer.clone(), PeerSet::Collation, ObservedRole::Full)
-			.await;
+		network_handle.connect_peer(peer, PeerSet::Validation, ObservedRole::Full).await;
+		network_handle.connect_peer(peer, PeerSet::Collation, ObservedRole::Full).await;
 
 		await_peer_connections(&shared, 1, 1).await;
 
@@ -1040,7 +1020,7 @@ fn different_views_on_different_peer_sets() {
 		{
 			assert_sends_validation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer.clone(),
+					peer,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -1050,7 +1030,7 @@ fn different_views_on_different_peer_sets() {
 			.await;
 
 			assert_sends_validation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
@@ -1059,7 +1039,7 @@ fn different_views_on_different_peer_sets() {
 		{
 			assert_sends_collation_event_to_all(
 				NetworkBridgeEvent::PeerConnected(
-					peer.clone(),
+					peer,
 					ObservedRole::Full,
 					ValidationVersion::V1.into(),
 					None,
@@ -1069,7 +1049,7 @@ fn different_views_on_different_peer_sets() {
 			.await;
 
 			assert_sends_collation_event_to_all(
-				NetworkBridgeEvent::PeerViewChange(peer.clone(), View::default()),
+				NetworkBridgeEvent::PeerViewChange(peer, View::default()),
 				&mut virtual_overseer,
 			)
 			.await;
@@ -1080,7 +1060,7 @@ fn different_views_on_different_peer_sets() {
 
 		network_handle
 			.peer_message(
-				peer.clone(),
+				peer,
 				PeerSet::Validation,
 				WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(view_a.clone()).encode(),
 			)
@@ -1088,20 +1068,20 @@ fn different_views_on_different_peer_sets() {
 
 		network_handle
 			.peer_message(
-				peer.clone(),
+				peer,
 				PeerSet::Collation,
 				WireMessage::<protocol_v1::CollationProtocol>::ViewUpdate(view_b.clone()).encode(),
 			)
 			.await;
 
 		assert_sends_validation_event_to_all(
-			NetworkBridgeEvent::PeerViewChange(peer.clone(), view_a.clone()),
+			NetworkBridgeEvent::PeerViewChange(peer, view_a.clone()),
 			&mut virtual_overseer,
 		)
 		.await;
 
 		assert_sends_collation_event_to_all(
-			NetworkBridgeEvent::PeerViewChange(peer.clone(), view_b.clone()),
+			NetworkBridgeEvent::PeerViewChange(peer, view_b.clone()),
 			&mut virtual_overseer,
 		)
 		.await;
@@ -1117,7 +1097,7 @@ fn sent_views_include_finalized_number_update() {
 		let peer_a = PeerId::random();
 
 		network_handle
-			.connect_peer(peer_a.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer_a, PeerSet::Validation, ObservedRole::Full)
 			.await;
 
 		await_peer_connections(&shared, 1, 0).await;
@@ -1146,11 +1126,7 @@ fn sent_views_include_finalized_number_update() {
 
 		assert_network_actions_contains(
 			&actions,
-			&NetworkAction::WriteNotification(
-				peer_a.clone(),
-				PeerSet::Validation,
-				wire_message.clone(),
-			),
+			&NetworkAction::WriteNotification(peer_a, PeerSet::Validation, wire_message.clone()),
 		);
 		virtual_overseer
 	});
@@ -1164,14 +1140,14 @@ fn view_finalized_number_can_not_go_down() {
 		let peer_a = PeerId::random();
 
 		network_handle
-			.connect_peer(peer_a.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer_a, PeerSet::Validation, ObservedRole::Full)
 			.await;
 
 		await_peer_connections(&shared, 1, 0).await;
 
 		network_handle
 			.peer_message(
-				peer_a.clone(),
+				peer_a,
 				PeerSet::Validation,
 				WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(View::new(
 					vec![Hash::repeat_byte(0x01)],
@@ -1183,7 +1159,7 @@ fn view_finalized_number_can_not_go_down() {
 
 		network_handle
 			.peer_message(
-				peer_a.clone(),
+				peer_a,
 				PeerSet::Validation,
 				WireMessage::<protocol_v1::ValidationProtocol>::ViewUpdate(View::new(vec![], 0))
 					.encode(),
@@ -1193,7 +1169,7 @@ fn view_finalized_number_can_not_go_down() {
 		let actions = network_handle.next_network_actions(2).await;
 		assert_network_actions_contains(
 			&actions,
-			&NetworkAction::ReputationChange(peer_a.clone(), MALFORMED_VIEW_COST.into()),
+			&NetworkAction::ReputationChange(peer_a, MALFORMED_VIEW_COST.into()),
 		);
 		virtual_overseer
 	});

polkadot/node/network/bridge/src/tx/tests.rs

@@ -242,7 +242,7 @@ fn send_messages_to_peers() {
 		let peer = PeerId::random();
 
 		network_handle
-			.connect_peer(peer.clone(), PeerSet::Validation, ObservedRole::Full)
+			.connect_peer(peer, PeerSet::Validation, ObservedRole::Full)
 			.timeout(TIMEOUT)
 			.await
 			.expect("Timeout does not occur");
@@ -251,7 +251,7 @@ fn send_messages_to_peers() {
 		// so the single item sink has to be free explicitly
 
 		network_handle
-			.connect_peer(peer.clone(), PeerSet::Collation, ObservedRole::Full)
+			.connect_peer(peer, PeerSet::Collation, ObservedRole::Full)
 			.timeout(TIMEOUT)
 			.await
 			.expect("Timeout does not occur");
@@ -269,7 +269,7 @@ fn send_messages_to_peers() {
 			virtual_overseer
 				.send(FromOrchestra::Communication {
 					msg: NetworkBridgeTxMessage::SendValidationMessage(
-						vec![peer.clone()],
+						vec![peer],
 						Versioned::V1(message_v1.clone()),
 					),
 				})
@@ -284,7 +284,7 @@ fn send_messages_to_peers() {
 					.await
 					.expect("Timeout does not occur"),
 				NetworkAction::WriteNotification(
-					peer.clone(),
+					peer,
 					PeerSet::Validation,
 					WireMessage::ProtocolMessage(message_v1).encode(),
 				)
@@ -306,7 +306,7 @@ fn send_messages_to_peers() {
 			virtual_overseer
 				.send(FromOrchestra::Communication {
 					msg: NetworkBridgeTxMessage::SendCollationMessage(
-						vec![peer.clone()],
+						vec![peer],
 						Versioned::V1(message_v1.clone()),
 					),
 				})
@@ -319,7 +319,7 @@ fn send_messages_to_peers() {
 					.await
 					.expect("Timeout does not occur"),
 				NetworkAction::WriteNotification(
-					peer.clone(),
+					peer,
 					PeerSet::Collation,
 					WireMessage::ProtocolMessage(message_v1).encode(),
 				)

polkadot/node/network/bridge/src/validator_discovery.rs

@@ -311,7 +311,7 @@ mod tests {
 		let (ns, ads) = new_network();
 
 		let authority_ids: Vec<_> =
-			ads.by_peer_id.values().map(|v| v.iter()).flatten().cloned().collect();
+			ads.by_peer_id.values().flat_map(|v| v.iter()).cloned().collect();
 
 		futures::executor::block_on(async move {
 			let (failed, _) = oneshot::channel();
@@ -344,7 +344,7 @@ mod tests {
 		let (ns, ads) = new_network();
 
 		let authority_ids: Vec<_> =
-			ads.by_peer_id.values().map(|v| v.iter()).flatten().cloned().collect();
+			ads.by_peer_id.values().flat_map(|v| v.iter()).cloned().collect();
 
 		futures::executor::block_on(async move {
 			let (failed, failed_rx) = oneshot::channel();

polkadot/node/network/collator-protocol/src/collator_side/tests.rs

@@ -147,7 +147,7 @@ impl TestState {
 	fn current_group_validator_peer_ids(&self) -> Vec<PeerId> {
 		self.current_group_validator_indices()
 			.iter()
-			.map(|i| self.validator_peer_id[i.0 as usize].clone())
+			.map(|i| self.validator_peer_id[i.0 as usize])
 			.collect()
 	}
 
@@ -412,7 +412,7 @@ async fn connect_peer(
 	overseer_send(
 		virtual_overseer,
 		CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerConnected(
-			peer.clone(),
+			peer,
 			polkadot_node_network_protocol::ObservedRole::Authority,
 			CollationVersion::V1.into(),
 			authority_id.map(|v| HashSet::from([v])),
@@ -509,7 +509,7 @@ async fn send_peer_view_change(
 	overseer_send(
 		virtual_overseer,
 		CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerViewChange(
-			peer.clone(),
+			*peer,
 			View::new(hashes, 0),
 		)),
 	)
@@ -519,7 +519,7 @@ async fn send_peer_view_change(
 #[test]
 fn advertise_and_send_collation() {
 	let mut test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -540,7 +540,7 @@ fn advertise_and_send_collation() {
 				.into_iter()
 				.zip(test_state.current_group_validator_peer_ids())
 			{
-				connect_peer(&mut virtual_overseer, peer.clone(), Some(val.clone())).await;
+				connect_peer(&mut virtual_overseer, peer, Some(val.clone())).await;
 			}
 
 			// We declare to the connected validators that we are a collator.
@@ -550,7 +550,7 @@ fn advertise_and_send_collation() {
 				expect_declare_msg(&mut virtual_overseer, &test_state, &peer_id).await;
 			}
 
-			let peer = test_state.current_group_validator_peer_ids()[0].clone();
+			let peer = test_state.current_group_validator_peer_ids()[0];
 
 			// Send info about peer's view.
 			send_peer_view_change(&mut virtual_overseer, &peer, vec![test_state.relay_parent])
@@ -627,7 +627,7 @@ fn advertise_and_send_collation() {
 			let old_relay_parent = test_state.relay_parent;
 			test_state.advance_to_new_round(&mut virtual_overseer, false).await;
 
-			let peer = test_state.validator_peer_id[2].clone();
+			let peer = test_state.validator_peer_id[2];
 
 			// Re-request a collation.
 			let (pending_response, rx) = oneshot::channel();
@@ -658,7 +658,7 @@ fn advertise_and_send_collation() {
 			overseer_send(
 				&mut virtual_overseer,
 				CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerViewChange(
-					peer.clone(),
+					peer,
 					view![test_state.relay_parent],
 				)),
 			)
@@ -674,7 +674,7 @@ fn advertise_and_send_collation() {
 #[test]
 fn delay_reputation_change() {
 	let test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -694,7 +694,7 @@ fn delay_reputation_change() {
 				.into_iter()
 				.zip(test_state.current_group_validator_peer_ids())
 			{
-				connect_peer(&mut virtual_overseer, peer.clone(), Some(val.clone())).await;
+				connect_peer(&mut virtual_overseer, peer, Some(val.clone())).await;
 			}
 
 			// We declare to the connected validators that we are a collator.
@@ -704,7 +704,7 @@ fn delay_reputation_change() {
 				expect_declare_msg(&mut virtual_overseer, &test_state, &peer_id).await;
 			}
 
-			let peer = test_state.current_group_validator_peer_ids()[0].clone();
+			let peer = test_state.current_group_validator_peer_ids()[0];
 
 			// Send info about peer's view.
 			send_peer_view_change(&mut virtual_overseer, &peer, vec![test_state.relay_parent])
@@ -773,6 +773,7 @@ fn delay_reputation_change() {
 }
 
 #[test]
+#[allow(clippy::async_yields_async)]
 fn send_only_one_collation_per_relay_parent_at_a_time() {
 	test_validator_send_sequence(|mut second_response_receiver, feedback_first_tx| async move {
 		Delay::new(Duration::from_millis(100)).await;
@@ -788,6 +789,7 @@ fn send_only_one_collation_per_relay_parent_at_a_time() {
 }
 
 #[test]
+#[allow(clippy::async_yields_async)]
 fn send_next_collation_after_max_unshared_upload_time() {
 	test_validator_send_sequence(|second_response_receiver, _| async move {
 		Delay::new(MAX_UNSHARED_UPLOAD_TIME + Duration::from_millis(50)).await;
@@ -798,7 +800,7 @@ fn send_next_collation_after_max_unshared_upload_time() {
 #[test]
 fn collators_declare_to_connected_peers() {
 	let test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -806,14 +808,13 @@ fn collators_declare_to_connected_peers() {
 		collator_pair,
 		ReputationAggregator::new(|_| true),
 		|mut test_harness| async move {
-			let peer = test_state.validator_peer_id[0].clone();
+			let peer = test_state.validator_peer_id[0];
 			let validator_id = test_state.current_group_validator_authority_ids()[0].clone();
 
 			setup_system(&mut test_harness.virtual_overseer, &test_state).await;
 
 			// A validator connected to us
-			connect_peer(&mut test_harness.virtual_overseer, peer.clone(), Some(validator_id))
-				.await;
+			connect_peer(&mut test_harness.virtual_overseer, peer, Some(validator_id)).await;
 			expect_declare_msg(&mut test_harness.virtual_overseer, &test_state, &peer).await;
 			test_harness
 		},
@@ -823,7 +824,7 @@ fn collators_declare_to_connected_peers() {
 #[test]
 fn collations_are_only_advertised_to_validators_with_correct_view() {
 	let test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -833,19 +834,19 @@ fn collations_are_only_advertised_to_validators_with_correct_view() {
 		|mut test_harness| async move {
 			let virtual_overseer = &mut test_harness.virtual_overseer;
 
-			let peer = test_state.current_group_validator_peer_ids()[0].clone();
+			let peer = test_state.current_group_validator_peer_ids()[0];
 			let validator_id = test_state.current_group_validator_authority_ids()[0].clone();
 
-			let peer2 = test_state.current_group_validator_peer_ids()[1].clone();
+			let peer2 = test_state.current_group_validator_peer_ids()[1];
 			let validator_id2 = test_state.current_group_validator_authority_ids()[1].clone();
 
 			setup_system(virtual_overseer, &test_state).await;
 
 			// A validator connected to us
-			connect_peer(virtual_overseer, peer.clone(), Some(validator_id)).await;
+			connect_peer(virtual_overseer, peer, Some(validator_id)).await;
 
 			// Connect the second validator
-			connect_peer(virtual_overseer, peer2.clone(), Some(validator_id2)).await;
+			connect_peer(virtual_overseer, peer2, Some(validator_id2)).await;
 
 			expect_declare_msg(virtual_overseer, &test_state, &peer).await;
 			expect_declare_msg(virtual_overseer, &test_state, &peer2).await;
@@ -870,7 +871,7 @@ fn collations_are_only_advertised_to_validators_with_correct_view() {
 #[test]
 fn collate_on_two_different_relay_chain_blocks() {
 	let mut test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -880,19 +881,19 @@ fn collate_on_two_different_relay_chain_blocks() {
 		|mut test_harness| async move {
 			let virtual_overseer = &mut test_harness.virtual_overseer;
 
-			let peer = test_state.current_group_validator_peer_ids()[0].clone();
+			let peer = test_state.current_group_validator_peer_ids()[0];
 			let validator_id = test_state.current_group_validator_authority_ids()[0].clone();
 
-			let peer2 = test_state.current_group_validator_peer_ids()[1].clone();
+			let peer2 = test_state.current_group_validator_peer_ids()[1];
 			let validator_id2 = test_state.current_group_validator_authority_ids()[1].clone();
 
 			setup_system(virtual_overseer, &test_state).await;
 
 			// A validator connected to us
-			connect_peer(virtual_overseer, peer.clone(), Some(validator_id)).await;
+			connect_peer(virtual_overseer, peer, Some(validator_id)).await;
 
 			// Connect the second validator
-			connect_peer(virtual_overseer, peer2.clone(), Some(validator_id2)).await;
+			connect_peer(virtual_overseer, peer2, Some(validator_id2)).await;
 
 			expect_declare_msg(virtual_overseer, &test_state, &peer).await;
 			expect_declare_msg(virtual_overseer, &test_state, &peer2).await;
@@ -921,7 +922,7 @@ fn collate_on_two_different_relay_chain_blocks() {
 #[test]
 fn validator_reconnect_does_not_advertise_a_second_time() {
 	let test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -931,13 +932,13 @@ fn validator_reconnect_does_not_advertise_a_second_time() {
 		|mut test_harness| async move {
 			let virtual_overseer = &mut test_harness.virtual_overseer;
 
-			let peer = test_state.current_group_validator_peer_ids()[0].clone();
+			let peer = test_state.current_group_validator_peer_ids()[0];
 			let validator_id = test_state.current_group_validator_authority_ids()[0].clone();
 
 			setup_system(virtual_overseer, &test_state).await;
 
 			// A validator connected to us
-			connect_peer(virtual_overseer, peer.clone(), Some(validator_id.clone())).await;
+			connect_peer(virtual_overseer, peer, Some(validator_id.clone())).await;
 			expect_declare_msg(virtual_overseer, &test_state, &peer).await;
 
 			distribute_collation(virtual_overseer, &test_state, true).await;
@@ -946,8 +947,8 @@ fn validator_reconnect_does_not_advertise_a_second_time() {
 			expect_advertise_collation_msg(virtual_overseer, &peer, test_state.relay_parent).await;
 
 			// Disconnect and reconnect directly
-			disconnect_peer(virtual_overseer, peer.clone()).await;
-			connect_peer(virtual_overseer, peer.clone(), Some(validator_id)).await;
+			disconnect_peer(virtual_overseer, peer).await;
+			connect_peer(virtual_overseer, peer, Some(validator_id)).await;
 			expect_declare_msg(virtual_overseer, &test_state, &peer).await;
 
 			send_peer_view_change(virtual_overseer, &peer, vec![test_state.relay_parent]).await;
@@ -961,7 +962,7 @@ fn validator_reconnect_does_not_advertise_a_second_time() {
 #[test]
 fn collators_reject_declare_messages() {
 	let test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 	let collator_pair2 = CollatorPair::generate().0;
 
@@ -972,19 +973,19 @@ fn collators_reject_declare_messages() {
 		|mut test_harness| async move {
 			let virtual_overseer = &mut test_harness.virtual_overseer;
 
-			let peer = test_state.current_group_validator_peer_ids()[0].clone();
+			let peer = test_state.current_group_validator_peer_ids()[0];
 			let validator_id = test_state.current_group_validator_authority_ids()[0].clone();
 
 			setup_system(virtual_overseer, &test_state).await;
 
 			// A validator connected to us
-			connect_peer(virtual_overseer, peer.clone(), Some(validator_id)).await;
+			connect_peer(virtual_overseer, peer, Some(validator_id)).await;
 			expect_declare_msg(virtual_overseer, &test_state, &peer).await;
 
 			overseer_send(
 				virtual_overseer,
 				CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
-					peer.clone(),
+					peer,
 					Versioned::V1(protocol_v1::CollatorProtocolMessage::Declare(
 						collator_pair2.public(),
 						ParaId::from(5),
@@ -1021,7 +1022,7 @@ where
 	F: Future<Output = oneshot::Receiver<sc_network::config::OutgoingResponse>>,
 {
 	let test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -1042,7 +1043,7 @@ where
 				.into_iter()
 				.zip(test_state.current_group_validator_peer_ids())
 			{
-				connect_peer(virtual_overseer, peer.clone(), Some(val.clone())).await;
+				connect_peer(virtual_overseer, peer, Some(val.clone())).await;
 			}
 
 			// We declare to the connected validators that we are a collator.
@@ -1052,8 +1053,8 @@ where
 				expect_declare_msg(virtual_overseer, &test_state, &peer_id).await;
 			}
 
-			let validator_0 = test_state.current_group_validator_peer_ids()[0].clone();
-			let validator_1 = test_state.current_group_validator_peer_ids()[1].clone();
+			let validator_0 = test_state.current_group_validator_peer_ids()[0];
+			let validator_1 = test_state.current_group_validator_peer_ids()[1];
 
 			// Send info about peer's view.
 			send_peer_view_change(virtual_overseer, &validator_0, vec![test_state.relay_parent])
@@ -1149,7 +1150,7 @@ where
 #[test]
 fn connect_to_buffered_groups() {
 	let mut test_state = TestState::default();
-	let local_peer_id = test_state.local_peer_id.clone();
+	let local_peer_id = test_state.local_peer_id;
 	let collator_pair = test_state.collator_pair.clone();
 
 	test_harness(
@@ -1180,7 +1181,7 @@ fn connect_to_buffered_groups() {
 			let head_a = test_state.relay_parent;
 
 			for (val, peer) in group_a.iter().zip(&peers_a) {
-				connect_peer(&mut virtual_overseer, peer.clone(), Some(val.clone())).await;
+				connect_peer(&mut virtual_overseer, *peer, Some(val.clone())).await;
 			}
 
 			for peer_id in &peers_a {

polkadot/node/network/collator-protocol/src/validator_side/tests.rs

@@ -313,7 +313,7 @@ async fn connect_and_declare_collator(
 	overseer_send(
 		virtual_overseer,
 		CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerConnected(
-			peer.clone(),
+			peer,
 			ObservedRole::Full,
 			CollationVersion::V1.into(),
 			None,
@@ -324,7 +324,7 @@ async fn connect_and_declare_collator(
 	overseer_send(
 		virtual_overseer,
 		CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
-			peer.clone(),
+			peer,
 			Versioned::V1(protocol_v1::CollatorProtocolMessage::Declare(
 				collator.public(),
 				para_id,
@@ -376,13 +376,13 @@ fn act_on_advertisement() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			pair.clone(),
 			test_state.chain_ids[0],
 		)
 		.await;
 
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), test_state.relay_parent).await;
+		advertise_collation(&mut virtual_overseer, peer_b, test_state.relay_parent).await;
 
 		assert_fetch_collation_request(
 			&mut virtual_overseer,
@@ -418,17 +418,17 @@ fn collator_reporting_works() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			test_state.collators[0].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_c.clone(),
+			peer_c,
 			test_state.collators[1].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
@@ -477,7 +477,7 @@ fn collator_authentication_verification_works() {
 		overseer_send(
 			&mut virtual_overseer,
 			CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
-				peer_b.clone(),
+				peer_b,
 				Versioned::V1(protocol_v1::CollatorProtocolMessage::Declare(
 					test_state.collators[0].public(),
 					test_state.chain_ids[0],
@@ -529,22 +529,22 @@ fn fetch_one_collation_at_a_time() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			test_state.collators[0].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_c.clone(),
+			peer_c,
 			test_state.collators[1].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), test_state.relay_parent).await;
-		advertise_collation(&mut virtual_overseer, peer_c.clone(), test_state.relay_parent).await;
+		advertise_collation(&mut virtual_overseer, peer_b, test_state.relay_parent).await;
+		advertise_collation(&mut virtual_overseer, peer_c, test_state.relay_parent).await;
 
 		let response_channel = assert_fetch_collation_request(
 			&mut virtual_overseer,
@@ -615,31 +615,31 @@ fn fetches_next_collation() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			test_state.collators[2].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_c.clone(),
+			peer_c,
 			test_state.collators[3].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_d.clone(),
+			peer_d,
 			test_state.collators[4].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), second).await;
-		advertise_collation(&mut virtual_overseer, peer_c.clone(), second).await;
-		advertise_collation(&mut virtual_overseer, peer_d.clone(), second).await;
+		advertise_collation(&mut virtual_overseer, peer_b, second).await;
+		advertise_collation(&mut virtual_overseer, peer_c, second).await;
+		advertise_collation(&mut virtual_overseer, peer_d, second).await;
 
 		// Dropping the response channel should lead to fetching the second collation.
 		assert_fetch_collation_request(&mut virtual_overseer, second, test_state.chain_ids[0])
@@ -708,9 +708,9 @@ fn reject_connection_to_next_group() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			test_state.collators[0].clone(),
-			test_state.chain_ids[1].clone(), // next, not current `para_id`
+			test_state.chain_ids[1], // next, not current `para_id`
 		)
 		.await;
 
@@ -757,22 +757,22 @@ fn fetch_next_collation_on_invalid_collation() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			test_state.collators[0].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_c.clone(),
+			peer_c,
 			test_state.collators[1].clone(),
-			test_state.chain_ids[0].clone(),
+			test_state.chain_ids[0],
 		)
 		.await;
 
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), test_state.relay_parent).await;
-		advertise_collation(&mut virtual_overseer, peer_c.clone(), test_state.relay_parent).await;
+		advertise_collation(&mut virtual_overseer, peer_b, test_state.relay_parent).await;
+		advertise_collation(&mut virtual_overseer, peer_c, test_state.relay_parent).await;
 
 		let response_channel = assert_fetch_collation_request(
 			&mut virtual_overseer,
@@ -854,12 +854,12 @@ fn inactive_disconnected() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			pair.clone(),
 			test_state.chain_ids[0],
 		)
 		.await;
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), test_state.relay_parent).await;
+		advertise_collation(&mut virtual_overseer, peer_b, test_state.relay_parent).await;
 
 		assert_fetch_collation_request(
 			&mut virtual_overseer,
@@ -870,7 +870,7 @@ fn inactive_disconnected() {
 
 		Delay::new(ACTIVITY_TIMEOUT * 3).await;
 
-		assert_collator_disconnect(&mut virtual_overseer, peer_b.clone()).await;
+		assert_collator_disconnect(&mut virtual_overseer, peer_b).await;
 		virtual_overseer
 	});
 }
@@ -905,7 +905,7 @@ fn activity_extends_life() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			pair.clone(),
 			test_state.chain_ids[0],
 		)
@@ -913,28 +913,28 @@ fn activity_extends_life() {
 
 		Delay::new(ACTIVITY_TIMEOUT * 2 / 3).await;
 
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), hash_a).await;
+		advertise_collation(&mut virtual_overseer, peer_b, hash_a).await;
 
 		assert_fetch_collation_request(&mut virtual_overseer, hash_a, test_state.chain_ids[0])
 			.await;
 
 		Delay::new(ACTIVITY_TIMEOUT * 2 / 3).await;
 
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), hash_b).await;
+		advertise_collation(&mut virtual_overseer, peer_b, hash_b).await;
 
 		assert_fetch_collation_request(&mut virtual_overseer, hash_b, test_state.chain_ids[0])
 			.await;
 
 		Delay::new(ACTIVITY_TIMEOUT * 2 / 3).await;
 
-		advertise_collation(&mut virtual_overseer, peer_b.clone(), hash_c).await;
+		advertise_collation(&mut virtual_overseer, peer_b, hash_c).await;
 
 		assert_fetch_collation_request(&mut virtual_overseer, hash_c, test_state.chain_ids[0])
 			.await;
 
 		Delay::new(ACTIVITY_TIMEOUT * 3 / 2).await;
 
-		assert_collator_disconnect(&mut virtual_overseer, peer_b.clone()).await;
+		assert_collator_disconnect(&mut virtual_overseer, peer_b).await;
 
 		virtual_overseer
 	});
@@ -962,7 +962,7 @@ fn disconnect_if_no_declare() {
 		overseer_send(
 			&mut virtual_overseer,
 			CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerConnected(
-				peer_b.clone(),
+				peer_b,
 				ObservedRole::Full,
 				CollationVersion::V1.into(),
 				None,
@@ -970,7 +970,7 @@ fn disconnect_if_no_declare() {
 		)
 		.await;
 
-		assert_collator_disconnect(&mut virtual_overseer, peer_b.clone()).await;
+		assert_collator_disconnect(&mut virtual_overseer, peer_b).await;
 
 		virtual_overseer
 	})
@@ -1000,7 +1000,7 @@ fn disconnect_if_wrong_declare() {
 		overseer_send(
 			&mut virtual_overseer,
 			CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerConnected(
-				peer_b.clone(),
+				peer_b,
 				ObservedRole::Full,
 				CollationVersion::V1.into(),
 				None,
@@ -1011,7 +1011,7 @@ fn disconnect_if_wrong_declare() {
 		overseer_send(
 			&mut virtual_overseer,
 			CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
-				peer_b.clone(),
+				peer_b,
 				Versioned::V1(protocol_v1::CollatorProtocolMessage::Declare(
 					pair.public(),
 					ParaId::from(69),
@@ -1031,7 +1031,7 @@ fn disconnect_if_wrong_declare() {
 			}
 		);
 
-		assert_collator_disconnect(&mut virtual_overseer, peer_b.clone()).await;
+		assert_collator_disconnect(&mut virtual_overseer, peer_b).await;
 
 		virtual_overseer
 	})
@@ -1061,7 +1061,7 @@ fn delay_reputation_change() {
 		overseer_send(
 			&mut virtual_overseer,
 			CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerConnected(
-				peer_b.clone(),
+				peer_b,
 				ObservedRole::Full,
 				CollationVersion::V1.into(),
 				None,
@@ -1072,7 +1072,7 @@ fn delay_reputation_change() {
 		overseer_send(
 			&mut virtual_overseer,
 			CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
-				peer_b.clone(),
+				peer_b,
 				Versioned::V1(protocol_v1::CollatorProtocolMessage::Declare(
 					pair.public(),
 					ParaId::from(69),
@@ -1085,7 +1085,7 @@ fn delay_reputation_change() {
 		overseer_send(
 			&mut virtual_overseer,
 			CollatorProtocolMessage::NetworkBridgeUpdate(NetworkBridgeEvent::PeerMessage(
-				peer_b.clone(),
+				peer_b,
 				Versioned::V1(protocol_v1::CollatorProtocolMessage::Declare(
 					pair.public(),
 					ParaId::from(69),
@@ -1145,7 +1145,7 @@ fn view_change_clears_old_collators() {
 
 		connect_and_declare_collator(
 			&mut virtual_overseer,
-			peer_b.clone(),
+			peer_b,
 			pair.clone(),
 			test_state.chain_ids[0],
 		)
@@ -1164,7 +1164,7 @@ fn view_change_clears_old_collators() {
 		test_state.group_rotation_info = test_state.group_rotation_info.bump_rotation();
 		respond_to_core_info_queries(&mut virtual_overseer, &test_state).await;
 
-		assert_collator_disconnect(&mut virtual_overseer, peer_b.clone()).await;
+		assert_collator_disconnect(&mut virtual_overseer, peer_b).await;
 
 		virtual_overseer
 	})

polkadot/node/network/dispute-distribution/src/tests/mock.rs

@@ -70,7 +70,7 @@ pub static ref MOCK_VALIDATORS_DISCOVERY_KEYS: HashMap<Sr25519Keyring, Authority
 	MOCK_VALIDATORS
 	.iter()
 	.chain(MOCK_AUTHORITIES_NEXT_SESSION.iter())
-	.map(|v| (v.clone(), v.public().into()))
+	.map(|v| (*v, v.public().into()))
 	.collect()
 ;
 pub static ref FERDIE_DISCOVERY_KEY: AuthorityDiscoveryId =

polkadot/node/network/gossip-support/src/tests.rs

@@ -643,8 +643,8 @@ fn issues_a_connection_request_when_last_request_was_mostly_unresolved() {
 					let mut expected = get_address_map(AUTHORITIES_WITHOUT_US.clone()).await;
 					expected.remove(&alice);
 					expected.remove(&bob);
-					let expected: HashSet<Multiaddr> = expected.into_iter().map(|(_,v)| v.into_iter()).flatten().collect();
-					assert_eq!(validator_addrs.into_iter().map(|v| v.into_iter()).flatten().collect::<HashSet<_>>(), expected);
+					let expected: HashSet<Multiaddr> = expected.into_values().flat_map(|v| v.into_iter()).collect();
+					assert_eq!(validator_addrs.into_iter().flat_map(|v| v.into_iter()).collect::<HashSet<_>>(), expected);
 					assert_eq!(peer_set, PeerSet::Validation);
 				}
 			);
@@ -707,8 +707,8 @@ fn issues_a_connection_request_when_last_request_was_mostly_unresolved() {
 			}) => {
 				let mut expected = get_address_map(AUTHORITIES_WITHOUT_US.clone()).await;
 				expected.remove(&bob);
-				let expected: HashSet<Multiaddr> = expected.into_iter().map(|(_,v)| v.into_iter()).flatten().collect();
-				assert_eq!(validator_addrs.into_iter().map(|v| v.into_iter()).flatten().collect::<HashSet<_>>(), expected);
+				let expected: HashSet<Multiaddr> = expected.into_values().flat_map(|v| v.into_iter()).collect();
+				assert_eq!(validator_addrs.into_iter().flat_map(|v| v.into_iter()).collect::<HashSet<_>>(), expected);
 				assert_eq!(peer_set, PeerSet::Validation);
 			}
 		);

polkadot/node/network/statement-distribution/src/tests.rs

@@ -210,8 +210,8 @@ fn note_local_works() {
 	let hash_b = CandidateHash([2; 32].into());
 
 	let mut per_peer_tracker = VcPerPeerTracker::default();
-	per_peer_tracker.note_local(hash_a.clone());
-	per_peer_tracker.note_local(hash_b.clone());
+	per_peer_tracker.note_local(hash_a);
+	per_peer_tracker.note_local(hash_b);
 
 	assert!(per_peer_tracker.local_observed.contains(&hash_a));
 	assert!(per_peer_tracker.local_observed.contains(&hash_b));
@@ -227,9 +227,9 @@ fn note_remote_works() {
 	let hash_c = CandidateHash([3; 32].into());
 
 	let mut per_peer_tracker = VcPerPeerTracker::default();
-	assert!(per_peer_tracker.note_remote(hash_a.clone()));
-	assert!(per_peer_tracker.note_remote(hash_b.clone()));
-	assert!(!per_peer_tracker.note_remote(hash_c.clone()));
+	assert!(per_peer_tracker.note_remote(hash_a));
+	assert!(per_peer_tracker.note_remote(hash_b));
+	assert!(!per_peer_tracker.note_remote(hash_c));
 
 	assert!(per_peer_tracker.remote_observed.contains(&hash_a));
 	assert!(per_peer_tracker.remote_observed.contains(&hash_b));
@@ -516,9 +516,9 @@ fn peer_view_update_sends_messages() {
 
 	executor::block_on(async move {
 		let mut topology = GridNeighbors::empty();
-		topology.peers_x = HashSet::from_iter(vec![peer.clone()].into_iter());
+		topology.peers_x = HashSet::from_iter(vec![peer].into_iter());
 		update_peer_view_and_maybe_send_unlocked(
-			peer.clone(),
+			peer,
 			&topology,
 			&mut peer_data,
 			&mut ctx,
@@ -553,7 +553,7 @@ fn peer_view_update_sends_messages() {
 		// it will not change between runs of the program.
 		for statement in active_head.statements_about(candidate_hash) {
 			let message = handle.recv().await;
-			let expected_to = vec![peer.clone()];
+			let expected_to = vec![peer];
 			let expected_payload =
 				statement_message(hash_c, statement.statement.clone(), &Metrics::default());
 
@@ -596,14 +596,14 @@ fn circulated_statement_goes_to_all_peers_with_view() {
 
 	let peer_data_from_view = |view: View| PeerData {
 		view: view.clone(),
-		view_knowledge: view.iter().map(|v| (v.clone(), Default::default())).collect(),
+		view_knowledge: view.iter().map(|v| (*v, Default::default())).collect(),
 		maybe_authority: None,
 	};
 
 	let mut peer_data: HashMap<_, _> = vec![
-		(peer_a.clone(), peer_data_from_view(peer_a_view)),
-		(peer_b.clone(), peer_data_from_view(peer_b_view)),
-		(peer_c.clone(), peer_data_from_view(peer_c_view)),
+		(peer_a, peer_data_from_view(peer_a_view)),
+		(peer_b, peer_data_from_view(peer_b_view)),
+		(peer_c, peer_data_from_view(peer_c_view)),
 	]
 	.into_iter()
 	.collect();
@@ -644,8 +644,7 @@ fn circulated_statement_goes_to_all_peers_with_view() {
 		let statement = StoredStatement { comparator: &comparator, statement: &statement };
 
 		let mut topology = GridNeighbors::empty();
-		topology.peers_x =
-			HashSet::from_iter(vec![peer_a.clone(), peer_b.clone(), peer_c.clone()].into_iter());
+		topology.peers_x = HashSet::from_iter(vec![peer_a, peer_b, peer_c].into_iter());
 		let needs_dependents = circulate_statement(
 			RequiredRouting::GridXY,
 			&topology,
@@ -786,7 +785,7 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_a.clone(),
+						peer_a,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						None,
@@ -799,7 +798,7 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_b.clone(),
+						peer_b,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						None,
@@ -811,7 +810,7 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_a.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_a, view![hash_a]),
 				),
 			})
 			.await;
@@ -819,7 +818,7 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_b, view![hash_a]),
 				),
 			})
 			.await;
@@ -853,7 +852,7 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_a.clone(),
+						peer_a,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::Statement(
 							hash_a,
 							statement.clone().into(),
@@ -887,7 +886,7 @@ fn receiving_from_one_sends_to_another_and_to_candidate_backing() {
 					)),
 				)
 			) => {
-				assert_eq!(recipients, vec![peer_b.clone()]);
+				assert_eq!(recipients, vec![peer_b]);
 				assert_eq!(r, hash_a);
 				assert_eq!(s, statement.into());
 			}
@@ -990,7 +989,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_a.clone(),
+						peer_a,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Alice.public().into()])),
@@ -1003,7 +1002,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_b.clone(),
+						peer_b,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Bob.public().into()])),
@@ -1015,7 +1014,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_c.clone(),
+						peer_c,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Charlie.public().into()])),
@@ -1027,7 +1026,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_bad.clone(),
+						peer_bad,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						None,
@@ -1039,7 +1038,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_a.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_a, view![hash_a]),
 				),
 			})
 			.await;
@@ -1047,21 +1046,21 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_b, view![hash_a]),
 				),
 			})
 			.await;
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_c.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_c, view![hash_a]),
 				),
 			})
 			.await;
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_bad.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_bad, view![hash_a]),
 				),
 			})
 			.await;
@@ -1098,7 +1097,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_a.clone(),
+						peer_a,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::LargeStatement(
 							metadata.clone(),
 						)),
@@ -1136,7 +1135,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_c.clone(),
+						peer_c,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::LargeStatement(
 							metadata.clone(),
 						)),
@@ -1150,7 +1149,7 @@ fn receiving_large_statement_from_one_sends_to_another_and_to_candidate_backing(
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_bad.clone(),
+						peer_bad,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::LargeStatement(
 							metadata.clone(),
 						)),
@@ -1486,7 +1485,7 @@ fn delay_reputation_changes() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_a.clone(),
+						peer_a,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Alice.public().into()])),
@@ -1499,7 +1498,7 @@ fn delay_reputation_changes() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_b.clone(),
+						peer_b,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Bob.public().into()])),
@@ -1511,7 +1510,7 @@ fn delay_reputation_changes() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_c.clone(),
+						peer_c,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Charlie.public().into()])),
@@ -1523,7 +1522,7 @@ fn delay_reputation_changes() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_bad.clone(),
+						peer_bad,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						None,
@@ -1535,7 +1534,7 @@ fn delay_reputation_changes() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_a.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_a, view![hash_a]),
 				),
 			})
 			.await;
@@ -1543,21 +1542,21 @@ fn delay_reputation_changes() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_b, view![hash_a]),
 				),
 			})
 			.await;
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_c.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_c, view![hash_a]),
 				),
 			})
 			.await;
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_bad.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_bad, view![hash_a]),
 				),
 			})
 			.await;
@@ -1594,7 +1593,7 @@ fn delay_reputation_changes() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_a.clone(),
+						peer_a,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::LargeStatement(
 							metadata.clone(),
 						)),
@@ -1632,7 +1631,7 @@ fn delay_reputation_changes() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_c.clone(),
+						peer_c,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::LargeStatement(
 							metadata.clone(),
 						)),
@@ -1646,7 +1645,7 @@ fn delay_reputation_changes() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_bad.clone(),
+						peer_bad,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::LargeStatement(
 							metadata.clone(),
 						)),
@@ -1962,7 +1961,7 @@ fn share_prioritizes_backing_group() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_a.clone(),
+						peer_a,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Alice.public().into()])),
@@ -1974,7 +1973,7 @@ fn share_prioritizes_backing_group() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_b.clone(),
+						peer_b,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Bob.public().into()])),
@@ -1986,7 +1985,7 @@ fn share_prioritizes_backing_group() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_c.clone(),
+						peer_c,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Charlie.public().into()])),
@@ -1998,7 +1997,7 @@ fn share_prioritizes_backing_group() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_bad.clone(),
+						peer_bad,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						None,
@@ -2010,7 +2009,7 @@ fn share_prioritizes_backing_group() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_other_group.clone(),
+						peer_other_group,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Dave.public().into()])),
@@ -2022,7 +2021,7 @@ fn share_prioritizes_backing_group() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_a.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_a, view![hash_a]),
 				),
 			})
 			.await;
@@ -2030,28 +2029,28 @@ fn share_prioritizes_backing_group() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_b.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_b, view![hash_a]),
 				),
 			})
 			.await;
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_c.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_c, view![hash_a]),
 				),
 			})
 			.await;
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_bad.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_bad, view![hash_a]),
 				),
 			})
 			.await;
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_other_group.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_other_group, view![hash_a]),
 				),
 			})
 			.await;
@@ -2232,7 +2231,7 @@ fn peer_cant_flood_with_large_statements() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerConnected(
-						peer_a.clone(),
+						peer_a,
 						ObservedRole::Full,
 						ValidationVersion::V1.into(),
 						Some(HashSet::from([Sr25519Keyring::Alice.public().into()])),
@@ -2244,7 +2243,7 @@ fn peer_cant_flood_with_large_statements() {
 		handle
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
-					NetworkBridgeEvent::PeerViewChange(peer_a.clone(), view![hash_a]),
+					NetworkBridgeEvent::PeerViewChange(peer_a, view![hash_a]),
 				),
 			})
 			.await;
@@ -2280,7 +2279,7 @@ fn peer_cant_flood_with_large_statements() {
 				.send(FromOrchestra::Communication {
 					msg: StatementDistributionMessage::NetworkBridgeUpdate(
 						NetworkBridgeEvent::PeerMessage(
-							peer_a.clone(),
+							peer_a,
 							Versioned::V1(
 								protocol_v1::StatementDistributionMessage::LargeStatement(
 									metadata.clone(),
@@ -2355,8 +2354,8 @@ fn handle_multiple_seconded_statements() {
 	for _ in 0..MIN_GOSSIP_PEERS + 2 {
 		all_peers.push(PeerId::random());
 	}
-	all_peers.push(peer_a.clone());
-	all_peers.push(peer_b.clone());
+	all_peers.push(peer_a);
+	all_peers.push(peer_b);
 
 	let mut lucky_peers = all_peers.clone();
 	util::choose_random_subset_with_rng(
@@ -2438,7 +2437,7 @@ fn handle_multiple_seconded_statements() {
 				.send(FromOrchestra::Communication {
 					msg: StatementDistributionMessage::NetworkBridgeUpdate(
 						NetworkBridgeEvent::PeerConnected(
-							peer.clone(),
+							*peer,
 							ObservedRole::Full,
 							ValidationVersion::V1.into(),
 							None,
@@ -2449,7 +2448,7 @@ fn handle_multiple_seconded_statements() {
 			handle
 				.send(FromOrchestra::Communication {
 					msg: StatementDistributionMessage::NetworkBridgeUpdate(
-						NetworkBridgeEvent::PeerViewChange(peer.clone(), view![relay_parent_hash]),
+						NetworkBridgeEvent::PeerViewChange(*peer, view![relay_parent_hash]),
 					),
 				})
 				.await;
@@ -2470,13 +2469,13 @@ fn handle_multiple_seconded_statements() {
 				.map(|i| {
 					if i == 0 {
 						TopologyPeerInfo {
-							peer_ids: vec![peer_a.clone()],
+							peer_ids: vec![peer_a],
 							validator_index: ValidatorIndex(0),
 							discovery_id: AuthorityPair::generate().0.public(),
 						}
 					} else if i == 1 {
 						TopologyPeerInfo {
-							peer_ids: vec![peer_b.clone()],
+							peer_ids: vec![peer_b],
 							validator_index: ValidatorIndex(1),
 							discovery_id: AuthorityPair::generate().0.public(),
 						}
@@ -2489,7 +2488,7 @@ fn handle_multiple_seconded_statements() {
 					} else if (i - 2) % dim == 0 {
 						let lucky_index = ((i - 2) / dim) - 1;
 						TopologyPeerInfo {
-							peer_ids: vec![lucky_peers[lucky_index].clone()],
+							peer_ids: vec![lucky_peers[lucky_index]],
 							validator_index: ValidatorIndex(i as _),
 							discovery_id: AuthorityPair::generate().0.public(),
 						}
@@ -2566,7 +2565,7 @@ fn handle_multiple_seconded_statements() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_a.clone(),
+						peer_a,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::Statement(
 							relay_parent_hash,
 							statement.clone().into(),
@@ -2618,7 +2617,7 @@ fn handle_multiple_seconded_statements() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_b.clone(),
+						peer_b,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::Statement(
 							relay_parent_hash,
 							statement.clone().into(),
@@ -2667,7 +2666,7 @@ fn handle_multiple_seconded_statements() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_a.clone(),
+						peer_a,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::Statement(
 							relay_parent_hash,
 							statement.clone().into(),
@@ -2718,7 +2717,7 @@ fn handle_multiple_seconded_statements() {
 			.send(FromOrchestra::Communication {
 				msg: StatementDistributionMessage::NetworkBridgeUpdate(
 					NetworkBridgeEvent::PeerMessage(
-						peer_b.clone(),
+						peer_b,
 						Versioned::V1(protocol_v1::StatementDistributionMessage::Statement(
 							relay_parent_hash,
 							statement.clone().into(),