Extract MockPeerStore to mock.rs

client/network/src/lib.rs

@@ -246,6 +246,9 @@ mod behaviour;
 mod protocol;
 mod service;
 
+#[cfg(test)]
+mod mock;
+
 pub mod config;
 pub mod discovery;
 pub mod error;

client/network/src/mock.rs

@@ -0,0 +1,55 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+//! Mocked components for tests.
+
+use crate::{peer_store::PeerStoreProvider, protocol_controller::ProtocolHandle, ReputationChange};
+use libp2p::PeerId;
+use std::collections::HashSet;
+
+/// No-op `PeerStore`.
+#[derive(Debug)]
+pub struct MockPeerStore {}
+
+impl PeerStoreProvider for MockPeerStore {
+	fn is_banned(&self, _peer_id: &PeerId) -> bool {
+		// Make sure that the peer is not banned.
+		false
+	}
+
+	fn register_protocol(&self, _protocol_handle: ProtocolHandle) {
+		// Make sure not to fail.
+	}
+
+	fn report_disconnect(&mut self, _peer_id: PeerId) {
+		// Make sure not to fail.
+	}
+
+	fn report_peer(&mut self, _peer_id: PeerId, _change: ReputationChange) {
+		// Make sure not to fail.
+	}
+
+	fn peer_reputation(&self, _peer_id: &PeerId) -> i32 {
+		// Make sure that the peer is not banned.
+		0
+	}
+
+	fn outgoing_candidates(&self, _count: usize, _ignored: HashSet<&PeerId>) -> Vec<PeerId> {
+		unimplemented!()
+	}
+}

client/network/src/protocol/notifications/behaviour.rs

@@ -2101,10 +2101,9 @@ impl NetworkBehaviour for Notifications {
 mod tests {
 	use super::*;
 	use crate::{
-		peer_store::PeerStoreProvider,
+		mock::MockPeerStore,
 		protocol::notifications::handler::tests::*,
-		protocol_controller::{IncomingIndex, ProtoSetConfig, ProtocolController, ProtocolHandle},
-		ReputationChange,
+		protocol_controller::{IncomingIndex, ProtoSetConfig, ProtocolController},
 	};
 	use libp2p::swarm::AddressRecord;
 	use sc_utils::mpsc::tracing_unbounded;
@@ -2153,35 +2152,6 @@ mod tests {
 		}
 	}
 
-	#[derive(Debug)]
-	struct MockPeerStore {}
-
-	impl PeerStoreProvider for MockPeerStore {
-		fn is_banned(&self, _peer_id: &PeerId) -> bool {
-			unimplemented!()
-		}
-
-		fn register_protocol(&self, _protocol_handle: ProtocolHandle) {
-			// Not a real peer store, do nothing.
-		}
-
-		fn report_disconnect(&mut self, _peer_id: PeerId) {
-			unimplemented!()
-		}
-
-		fn report_peer(&mut self, _peer_id: PeerId, _change: ReputationChange) {
-			unimplemented!()
-		}
-
-		fn peer_reputation(&self, _peer_id: &PeerId) -> i32 {
-			unimplemented!()
-		}
-
-		fn outgoing_candidates(&self, _count: usize, _ignored: HashSet<&PeerId>) -> Vec<PeerId> {
-			unimplemented!()
-		}
-	}
-
 	fn development_notifs() -> (Notifications, ProtocolController) {
 		let (to_notifications, from_controller) =
 			tracing_unbounded("test_controller_to_notifications", 10_000);

client/network/src/protocol_controller.rs

@@ -106,8 +106,8 @@ pub struct ProtoSetConfig {
 /// Message that is sent by [`ProtocolController`] to `Notifications`.
 #[derive(Debug, PartialEq)]
 pub enum Message {
-	/// Request to open a connection to the given peer. From the point of view of the `ProtocolController`, we are
-	/// immediately connected.
+	/// Request to open a connection to the given peer. From the point of view of the
+	/// `ProtocolController`, we are immediately connected.
 	Connect {
 		/// Set id to connect on.
 		set_id: SetId,

client/network/src/request_responses.rs

@@ -668,13 +668,15 @@ impl NetworkBehaviour for RequestResponsesBehaviour {
 								// The `tx` created above can be dropped if we are not capable of
 								// processing this request, which is reflected as a
 								// `InboundFailure::Omission` event.
-								rx.await.map_or(None, |response| Some(RequestProcessingOutcome {
-									peer,
-									request_id,
-									protocol,
-									inner_channel: channel,
-									response,
-								}))
+								rx.await.map_or(None, |response| {
+									Some(RequestProcessingOutcome {
+										peer,
+										request_id,
+										protocol,
+										inner_channel: channel,
+										response,
+									})
+								})
 							}));
 
 							// This `continue` makes sure that `pending_responses` gets polled
@@ -963,7 +965,7 @@ impl Codec for GenericCodec {
 mod tests {
 	use super::*;
 
-	use crate::{peer_store::PeerStoreProvider, protocol_controller::ProtocolHandle};
+	use crate::mock::MockPeerStore;
 	use futures::{channel::oneshot, executor::LocalPool, task::Spawn};
 	use libp2p::{
 		core::{
@@ -975,7 +977,7 @@ mod tests {
 		swarm::{Executor, Swarm, SwarmBuilder, SwarmEvent},
 		Multiaddr,
 	};
-	use std::{collections::HashSet, iter, time::Duration};
+	use std::{iter, time::Duration};
 
 	struct TokioExecutor(tokio::runtime::Runtime);
 	impl Executor for TokioExecutor {
@@ -984,36 +986,6 @@ mod tests {
 		}
 	}
 
-	#[derive(Debug)]
-	struct MockPeerStore {}
-
-	impl PeerStoreProvider for MockPeerStore {
-		fn is_banned(&self, _peer_id: &PeerId) -> bool {
-			unimplemented!()
-		}
-
-		fn register_protocol(&self, _protocol_handle: ProtocolHandle) {
-			unimplemented!()
-		}
-
-		fn report_disconnect(&mut self, _peer_id: PeerId) {
-			unimplemented!()
-		}
-
-		fn report_peer(&mut self, _peer_id: PeerId, _change: ReputationChange) {
-			unimplemented!()
-		}
-
-		fn peer_reputation(&self, _peer_id: &PeerId) -> i32 {
-			// We just need to make sure that the peer is not banned.
-			0
-		}
-
-		fn outgoing_candidates(&self, _count: usize, _ignored: HashSet<&PeerId>) -> Vec<PeerId> {
-			unimplemented!()
-		}
-	}
-
 	fn build_swarm(
 		list: impl Iterator<Item = ProtocolConfig>,
 	) -> (Swarm<RequestResponsesBehaviour>, Multiaddr) {