foo

node/malus/Cargo.toml

@@ -31,4 +31,5 @@ async-trait = "0.1.51"
 [dev-dependencies]
 polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-futures = "0.3.17"
+futures = "0.3.17"
+futures-timer = "3.0.2"

node/malus/src/lib.rs

@@ -24,6 +24,9 @@ use polkadot_node_subsystem::*;
 pub use polkadot_node_subsystem::{messages::AllMessages, overseer, FromOverseer};
 use std::{future::Future, pin::Pin};
 
+#[cfg(test)]
+mod tests;
+
 /// Filter incoming and outgoing messages.
 pub trait MessageInterceptor<Sender>: Send + Sync + Clone + 'static
 where
@@ -219,51 +222,3 @@ where
 		)
 	}
 }
-
-#[cfg(test)]
-mod tests {
-	use super::*;
-
-	use polkadot_node_subsystem_test_helpers::*;
-
-	use polkadot_node_subsystem::{
-		messages::{AllMessages, AvailabilityStoreMessage},
-		DummySubsystem,
-	};
-
-	#[derive(Clone, Debug)]
-	struct BlackHole;
-
-	impl<Sender> MessageInterceptor<Sender> for BlackHole {
-		type Message = AvailabilityStoreMessage;
-		fn intercept_incoming(
-			&self,
-			_sender: &mut Sender,
-			msg: FromOverseer<Self::Message>,
-		) -> Option<FromOverseer<Self::Message>> {
-			None
-		}
-	}
-
-	#[test]
-	fn test_name() {
-		let pool = sp_core::testing::TaskExecutor::new();
-		let (context, mut virtual_overseer) = make_subsystem_context(pool);
-
-		let sub = DummySubsystem::default();
-
-		let subi = InterceptedSubsystem::new(sub, BlackHole);
-
-		use overseer::channel;
-
-		let (tx, rx) = channel::oneshot();
-
-		pool.spawn(async move {
-			virtual_overseer
-				.send(AvailabilityStoreMessage::QueryChunk(Default::default(), 0.into(), tx))
-				.await;
-		});
-
-		let _ = rx.await.unwrap();
-	}
-}

node/malus/src/tests.rs

@@ -0,0 +1,77 @@
+use super::*;
+
+use polkadot_node_subsystem_test_helpers::*;
+
+use polkadot_node_subsystem::{
+	messages::{AllMessages, AvailabilityStoreMessage},
+	DummySubsystem,
+	overseer::Subsystem,
+};
+
+#[derive(Clone, Debug)]
+struct BlackHoleInterceptor;
+
+impl<Sender> MessageInterceptor<Sender> for BlackHoleInterceptor
+where
+	Sender: overseer::SubsystemSender<AllMessages> + overseer::SubsystemSender<AvailabilityStoreMessage> + Clone + 'static,
+{
+	type Message = AvailabilityStoreMessage;
+	fn intercept_incoming(
+		&self,
+		_sender: &mut Sender,
+		msg: FromOverseer<Self::Message>,
+	) -> Option<FromOverseer<Self::Message>> {
+		None
+	}
+}
+
+async fn overseer_send<T: Into<AllMessages>> (
+	overseer: &mut TestSubsystemContextHandle<T>,
+	msg: T,
+) {
+	overseer
+		.send(FromOverseer::Communication { msg })
+		.await;
+}
+
+
+#[test]
+fn integrity_test() {
+	let pool = sp_core::testing::TaskExecutor::new();
+	let (context, mut overseer) = make_subsystem_context(pool);
+
+	let sub = DummySubsystem;
+
+	let sub_intercepted = InterceptedSubsystem::new(sub, BlackHoleInterceptor);
+
+
+	// Try to send a message we know is going to be filtered.
+	let test_fut = async move {
+		let (tx, rx) = futures::channel::oneshot::channel();
+		overseer_send(
+			&mut overseer,
+				AvailabilityStoreMessage::QueryChunk(Default::default(), 0.into(), tx)
+			).await;
+		rx.await;
+		overseer
+	};
+	let subsystem = async move { sub_intercepted.start(context).await; };
+
+	futures::pin_mut!(test_fut);
+	futures::pin_mut!(subsystem);
+
+	futures::executor::block_on(futures::future::join(
+		async move {
+			let mut overseer = test_fut.await;
+			overseer
+				.send(FromOverseer::Signal(OverseerSignal::Conclude))
+				.await
+		},
+		subsystem,
+	))
+	.1
+	.unwrap();
+
+
+
+}

node/malus/src/variant-a.rs

@@ -27,19 +27,19 @@ use polkadot_cli::{
 	create_default_subsystems,
 	service::{
 		AuthorityDiscoveryApi, AuxStore, BabeApi, Block, Error, HeaderBackend, Overseer,
-		OverseerGen, OverseerGenArgs, OverseerHandle, ParachainHost, ProvideRuntimeApi, SpawnNamed,
+		OverseerGen, OverseerGenArgs, ParachainHost, ProvideRuntimeApi, SpawnNamed,
 	},
 	Cli,
 };
 
 // Import extra types relevant to the particular
 // subsystem.
 use polkadot_node_core_candidate_validation::CandidateValidationSubsystem;
-use polkadot_node_subsystem::{messages::CandidateValidationMessage, SubsystemSender};
+use polkadot_node_subsystem::{FromOverseer, messages::{AllMessages, CandidateValidationMessage}, overseer::{self, OverseerHandle,}};
 
-// Filter wrapping related types.
 use malus::*;
 
+// Filter wrapping related types.
 use std::sync::{
 	atomic::{AtomicUsize, Ordering},
 	Arc,
@@ -53,7 +53,7 @@ struct Skippy(Arc<AtomicUsize>);
 
 impl<Sender> MessageInterceptor<Sender> for Skippy
 where
-	Sender: SubsystemSender<AllMessages> + SubsystemSender<Self::Message> + Clone + 'static,
+	Sender: overseer::SubsystemSender<AllMessages> + overseer::SubsystemSender<CandidateValidationMessage> + Clone + 'static,
 {
 	type Message = CandidateValidationMessage;