".git/.scripts/commands/fmt/fmt.sh"

paritytech · Sep 9, 2024 · f194e5f · f194e5f
1 parent 3dd3834
commit f194e5f
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/polkadot/node/network/availability-recovery/src/task/strategy/full.rs b/polkadot/node/network/availability-recovery/src/task/strategy/full.rs
@@ -19,16 +19,17 @@ use crate::{
 	ErasureTask, PostRecoveryCheck, LOG_TARGET,
 };
 
+use futures::{channel::oneshot, SinkExt};
 use polkadot_node_network_protocol::request_response::{
 	self as req_res, outgoing::RequestError, OutgoingRequest, Recipient, Requests,
 };
 use polkadot_node_primitives::AvailableData;
 use polkadot_node_subsystem::{messages::NetworkBridgeTxMessage, overseer, RecoveryError};
 use polkadot_primitives::ValidatorIndex;
-use sc_network::{IfDisconnected, OutboundFailure, RequestFailure};
-use sc_network::request_responses::CustomOutboundFailure;
-use futures::{channel::oneshot, SinkExt};
 use rand::seq::SliceRandom;
+use sc_network::{
+	request_responses::CustomOutboundFailure, IfDisconnected, OutboundFailure, RequestFailure,
+};
 
 /// Parameters specific to the `FetchFull` strategy.
 pub struct FetchFullParams {
@@ -153,7 +154,9 @@ impl<Sender: overseer::AvailabilityRecoverySenderTrait> RecoveryStrategy<Sender>
 						RequestError::InvalidResponse(_) =>
 							common_params.metrics.on_full_request_invalid(),
 						RequestError::NetworkError(req_failure) => {
-							if let RequestFailure::Network(CustomOutboundFailure::Timeout) = req_failure {
+							if let RequestFailure::Network(CustomOutboundFailure::Timeout) =
+								req_failure
+							{
 								common_params.metrics.on_full_request_timeout();
 							} else {
 								common_params.metrics.on_full_request_error();

diff --git a/polkadot/node/network/availability-recovery/src/task/strategy/mod.rs b/polkadot/node/network/availability-recovery/src/task/strategy/mod.rs
@@ -30,7 +30,6 @@ use crate::{
 };
 
 use codec::Decode;
-use sc_network::request_responses::CustomOutboundFailure;
 use futures::{channel::oneshot, SinkExt};
 use polkadot_erasure_coding::branch_hash;
 #[cfg(not(test))]
@@ -44,7 +43,10 @@ use polkadot_node_subsystem::{
 	overseer, RecoveryError,
 };
 use polkadot_primitives::{AuthorityDiscoveryId, BlakeTwo256, ChunkIndex, HashT, ValidatorIndex};
-use sc_network::{IfDisconnected, OutboundFailure, ProtocolName, RequestFailure};
+use sc_network::{
+	request_responses::CustomOutboundFailure, IfDisconnected, OutboundFailure, ProtocolName,
+	RequestFailure,
+};
 use std::{
 	collections::{BTreeMap, HashMap, VecDeque},
 	time::Duration,

diff --git a/substrate/client/network/src/protocol/notifications/behaviour.rs b/substrate/client/network/src/protocol/notifications/behaviour.rs
@@ -2413,8 +2413,7 @@ mod tests {
 	}
 
 	fn development_notifs(
-	) -> (Notifications, ProtocolController, Box<dyn crate::service::traits::NotificationService>)
-	{
+	) -> (Notifications, ProtocolController, Box<dyn crate::service::traits::NotificationService>) {
 		let (protocol_handle_pair, notif_service) =
 			crate::protocol::notifications::service::notification_service("/proto/1".into());
 		let (to_notifications, from_controller) =

diff --git a/substrate/client/network/src/request_responses.rs b/substrate/client/network/src/request_responses.rs
@@ -739,7 +739,7 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 			}
 
 			let mut fallback_requests = vec![];
-			
+
 			// Poll request-responses protocols.
 			for (protocol, (ref mut behaviour, ref mut resp_builder)) in &mut self.protocols {
 				'poll_protocol: while let Poll::Ready(ev) = behaviour.poll(cx, params) {
@@ -909,7 +909,8 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 									// Try using the fallback request if the protocol was not
 									// supported.
 									if let OutboundFailure::UnsupportedProtocols = error {
-										let error_bis_out = CustomOutboundFailure::UnsupportedProtocols;
+										let error_bis_out =
+											CustomOutboundFailure::UnsupportedProtocols;
 										if let Some((fallback_request, fallback_protocol)) =
 											fallback_request
 										{

diff --git a/substrate/client/network/src/service.rs b/substrate/client/network/src/service.rs
@@ -1702,18 +1702,26 @@ where
 			SwarmEvent::Behaviour(BehaviourOut::None) => {
 				// Ignored event from lower layers.
 			},
-			SwarmEvent::Behaviour(BehaviourOut::Message{ peer, message }) => {
+			SwarmEvent::Behaviour(BehaviourOut::Message { peer, message }) => {
 				// Ignored event from lower layers.
-			},			
-			SwarmEvent::Behaviour(BehaviourOut::CustomOutboundFailure{ peer,request_id,error }) => {
+			},
+			SwarmEvent::Behaviour(BehaviourOut::CustomOutboundFailure {
+				peer,
+				request_id,
+				error,
+			}) => {
 				// Ignored event from lower layers.
 			},
-			SwarmEvent::Behaviour(BehaviourOut::CustomInboundFailure{ peer,request_id,error }) => {
+			SwarmEvent::Behaviour(BehaviourOut::CustomInboundFailure {
+				peer,
+				request_id,
+				error,
+			}) => {
 				// Ignored event from lower layers.
 			},
-			SwarmEvent::Behaviour(BehaviourOut::CustomResponseSent{ peer,request_id }) => {
+			SwarmEvent::Behaviour(BehaviourOut::CustomResponseSent { peer, request_id }) => {
 				// Ignored event from lower layers.
-			},			
+			},
 			SwarmEvent::ConnectionEstablished {
 				peer_id,
 				endpoint,

diff --git a/substrate/client/network/sync/src/engine.rs b/substrate/client/network/sync/src/engine.rs
@@ -56,7 +56,7 @@ use sc_consensus::{import_queue::ImportQueueService, IncomingBlock};
 use sc_network::{
 	config::{FullNetworkConfiguration, NotificationHandshake, ProtocolId, SetConfig},
 	peer_store::PeerStoreProvider,
-	request_responses::{IfDisconnected, RequestFailure, CustomOutboundFailure},
+	request_responses::{CustomOutboundFailure, IfDisconnected, RequestFailure},
 	service::{
 		traits::{Direction, NotificationConfig, NotificationEvent, ValidationResult},
 		NotificationMetrics,