cargo fmt and clippy

paritytech · Sep 23, 2022 · 200cdf0 · 200cdf0
1 parent 683ddc5
commit 200cdf0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/client/beefy/rpc/src/lib.rs b/client/beefy/rpc/src/lib.rs
@@ -35,7 +35,9 @@ use jsonrpsee::{
 };
 use log::warn;
 
-use beefy_gadget::communication::notification::{BeefyBestBlockStream, BeefyVersionedFinalityProofStream};
+use beefy_gadget::communication::notification::{
+	BeefyBestBlockStream, BeefyVersionedFinalityProofStream,
+};
 
 mod notification;
 

diff --git a/client/beefy/src/communication/request_response/incoming_requests_handler.rs b/client/beefy/src/communication/request_response/incoming_requests_handler.rs
@@ -153,8 +153,7 @@ where
 			.client
 			.justifications(&BlockId::Number(request.payload.begin))
 			.map_err(Error::Client)?
-			.map(|justifs| justifs.get(BEEFY_ENGINE_ID).cloned())
-			.flatten()
+			.and_then(|justifs| justifs.get(BEEFY_ENGINE_ID).cloned())
 			// No BEEFY justification present.
 			.ok_or(());
 

diff --git a/client/network/test/src/lib.rs b/client/network/test/src/lib.rs
@@ -50,12 +50,11 @@ use sc_consensus::{
 pub use sc_network::config::EmptyTransactionPool;
 use sc_network::{
 	config::{
-		NetworkConfiguration, NonDefaultSetConfig, NonReservedPeerMode, Role, SyncMode,
-		TransportConfig,
+		NetworkConfiguration, NonDefaultSetConfig, NonReservedPeerMode, RequestResponseConfig,
+		Role, SyncMode, TransportConfig,
 	},
 	Multiaddr, NetworkService, NetworkWorker,
 };
-use sc_network::config::RequestResponseConfig;
 use sc_network_common::{
 	config::{MultiaddrWithPeerId, ProtocolId},
 	protocol::ProtocolName,
@@ -795,7 +794,9 @@ where
 		network_config.transport = TransportConfig::MemoryOnly;
 		network_config.listen_addresses = vec![listen_addr.clone()];
 		network_config.allow_non_globals_in_dht = true;
-		network_config.request_response_protocols.extend(config.request_response_protocols);
+		network_config
+			.request_response_protocols
+			.extend(config.request_response_protocols);
 		network_config.extra_sets = config
 			.notifications_protocols
 			.into_iter()