refactor overseer into proc-macro based pattern (#2962)

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

@@ -26,9 +26,10 @@ use futures::{channel::oneshot, FutureExt};
 
 use polkadot_subsystem::messages::*;
 use polkadot_subsystem::{
-	PerLeafSpan, ActiveLeavesUpdate, FromOverseer, OverseerSignal, SpawnedSubsystem, Subsystem,
-	SubsystemContext, SubsystemResult,
+	PerLeafSpan, ActiveLeavesUpdate, FromOverseer, OverseerSignal, SpawnedSubsystem,
+	SubsystemContext, SubsystemResult, SubsystemError,
 	jaeger,
+	overseer,
 };
 use polkadot_node_subsystem_util::{
 	metrics::{self, prometheus},
@@ -162,6 +163,7 @@ impl BitfieldDistribution {
 	async fn run<Context>(self, mut ctx: Context)
 	where
 		Context: SubsystemContext<Message = BitfieldDistributionMessage>,
+		Context: overseer::SubsystemContext<Message = BitfieldDistributionMessage>,
 	{
 		// work: process incoming messages from the overseer and process accordingly.
 		let mut state = ProtocolState::default();
@@ -250,9 +252,9 @@ where
 {
 	tracing::trace!(target: LOG_TARGET, ?rep, peer_id = %peer, "reputation change");
 
-	ctx.send_message(AllMessages::NetworkBridge(
+	ctx.send_message(
 		NetworkBridgeMessage::ReportPeer(peer, rep),
-	))
+	)
 	.await
 }
 
@@ -328,7 +330,7 @@ where
 
 	let _span = span.child("provisionable");
 	// notify the overseer about a new and valid signed bitfield
-	ctx.send_message(AllMessages::Provisioner(
+	ctx.send_message(
 		ProvisionerMessage::ProvisionableData(
 			message.relay_parent,
 			ProvisionableData::Bitfield(
@@ -336,7 +338,7 @@ where
 				message.signed_availability.clone(),
 			),
 		),
-	))
+	)
 	.await;
 
 	drop(_span);
@@ -383,12 +385,12 @@ where
 		);
 	} else {
 		let _span = span.child("gossip");
-		ctx.send_message(AllMessages::NetworkBridge(
+		ctx.send_message(
 			NetworkBridgeMessage::SendValidationMessage(
 				interested_peers,
 				message.into_validation_protocol(),
 			),
-		))
+		)
 		.await;
 	}
 }
@@ -687,19 +689,20 @@ where
 		.or_default()
 		.insert(validator.clone());
 
-	ctx.send_message(AllMessages::NetworkBridge(
+	ctx.send_message(
 		NetworkBridgeMessage::SendValidationMessage(
 			vec![dest],
 			message.into_validation_protocol(),
 		),
-	)).await;
+	).await;
 }
 
-impl<C> Subsystem<C> for BitfieldDistribution
+impl<Context> overseer::Subsystem<Context, SubsystemError> for BitfieldDistribution
 where
-	C: SubsystemContext<Message = BitfieldDistributionMessage> + Sync + Send,
+	Context: SubsystemContext<Message = BitfieldDistributionMessage>,
+	Context: overseer::SubsystemContext<Message = BitfieldDistributionMessage>,
 {
-	fn start(self, ctx: C) -> SpawnedSubsystem {
+	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = self.run(ctx)
 			.map(|_| Ok(()))
 			.boxed();
@@ -722,18 +725,17 @@ where
 	let (validators_tx, validators_rx) = oneshot::channel();
 	let (session_tx, session_rx) = oneshot::channel();
 
-	let query_validators = AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+	// query validators
+	ctx.send_message(RuntimeApiMessage::Request(
 		relay_parent.clone(),
 		RuntimeApiRequest::Validators(validators_tx),
-	));
+	)).await;
 
-	let query_signing = AllMessages::RuntimeApi(RuntimeApiMessage::Request(
+	// query signing context
+	ctx.send_message(RuntimeApiMessage::Request(
 		relay_parent.clone(),
 		RuntimeApiRequest::SessionIndexForChild(session_tx),
-	));
-
-	ctx.send_messages(std::iter::once(query_validators).chain(std::iter::once(query_signing)))
-		.await;
+	)).await;
 
 	match (validators_rx.await?, session_rx.await?) {
 		(Ok(v), Ok(s)) => Ok(Some((
@@ -837,4 +839,3 @@ impl metrics::Metrics for Metrics {
 		Ok(Metrics(Some(metrics)))
 	}
 }
-