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

polkadot/node/network/availability-recovery/src/lib.rs

@@ -34,12 +34,13 @@ use polkadot_primitives::v1::{
 };
 use polkadot_node_primitives::{ErasureChunk, AvailableData};
 use polkadot_subsystem::{
-	SubsystemContext, SubsystemResult, SubsystemError, Subsystem, SpawnedSubsystem, FromOverseer,
+	overseer::{self, Subsystem},
+	SubsystemContext, SubsystemResult, SubsystemError, SpawnedSubsystem, FromOverseer,
 	OverseerSignal, ActiveLeavesUpdate, SubsystemSender,
 	errors::RecoveryError,
 	jaeger,
 	messages::{
-		AvailabilityStoreMessage, AvailabilityRecoveryMessage, AllMessages, NetworkBridgeMessage,
+		AvailabilityStoreMessage, AvailabilityRecoveryMessage, NetworkBridgeMessage,
 	},
 };
 use polkadot_node_network_protocol::{
@@ -573,10 +574,12 @@ impl Default for State {
 	}
 }
 
-impl<C> Subsystem<C> for AvailabilityRecoverySubsystem
-	where C: SubsystemContext<Message = AvailabilityRecoveryMessage>
+impl<Context> Subsystem<Context, SubsystemError> for AvailabilityRecoverySubsystem
+where
+	Context: SubsystemContext<Message = AvailabilityRecoveryMessage>,
+	Context: overseer::SubsystemContext<Message = AvailabilityRecoveryMessage>,
 {
-	fn start(self, ctx: C) -> SpawnedSubsystem {
+	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = self.run(ctx)
 			.map_err(|e| SubsystemError::with_origin("availability-recovery", e))
 			.boxed();
@@ -609,14 +612,18 @@ async fn handle_signal(
 }
 
 /// Machinery around launching interactions into the background.
-async fn launch_interaction(
+async fn launch_interaction<Context>(
 	state: &mut State,
-	ctx: &mut impl SubsystemContext<Message = AvailabilityRecoveryMessage>,
+	ctx: &mut Context,
 	session_info: SessionInfo,
 	receipt: CandidateReceipt,
 	backing_group: Option<GroupIndex>,
 	response_sender: oneshot::Sender<Result<AvailableData, RecoveryError>>,
-) -> error::Result<()> {
+) -> error::Result<()>
+where
+	Context: SubsystemContext<Message = AvailabilityRecoveryMessage>,
+	Context: overseer::SubsystemContext<Message = AvailabilityRecoveryMessage>,
+{
 	let candidate_hash = receipt.hash();
 
 	let params = InteractionParams {
@@ -662,14 +669,18 @@ async fn launch_interaction(
 }
 
 /// Handles an availability recovery request.
-async fn handle_recover(
+async fn handle_recover<Context>(
 	state: &mut State,
-	ctx: &mut impl SubsystemContext<Message = AvailabilityRecoveryMessage>,
+	ctx: &mut Context,
 	receipt: CandidateReceipt,
 	session_index: SessionIndex,
 	backing_group: Option<GroupIndex>,
 	response_sender: oneshot::Sender<Result<AvailableData, RecoveryError>>,
-) -> error::Result<()> {
+) -> error::Result<()>
+where
+	Context: SubsystemContext<Message = AvailabilityRecoveryMessage>,
+	Context: overseer::SubsystemContext<Message = AvailabilityRecoveryMessage>,
+{
 	let candidate_hash = receipt.hash();
 
 	let span = jaeger::Span::new(candidate_hash, "availbility-recovery")
@@ -724,14 +735,18 @@ async fn handle_recover(
 }
 
 /// Queries a chunk from av-store.
-async fn query_full_data(
-	ctx: &mut impl SubsystemContext<Message = AvailabilityRecoveryMessage>,
+async fn query_full_data<Context>(
+	ctx: &mut Context,
 	candidate_hash: CandidateHash,
-) -> error::Result<Option<AvailableData>> {
+) -> error::Result<Option<AvailableData>>
+where
+	Context: SubsystemContext<Message = AvailabilityRecoveryMessage>,
+	Context: overseer::SubsystemContext<Message = AvailabilityRecoveryMessage>,
+{
 	let (tx, rx) = oneshot::channel();
-	ctx.send_message(AllMessages::AvailabilityStore(
+	ctx.send_message(
 		AvailabilityStoreMessage::QueryAvailableData(candidate_hash, tx),
-	)).await;
+	).await;
 
 	Ok(rx.await.map_err(error::Error::CanceledQueryFullData)?)
 }
@@ -747,10 +762,14 @@ impl AvailabilityRecoverySubsystem {
 		Self { fast_path: false }
 	}
 
-	async fn run(
+	async fn run<Context>(
 		self,
-		mut ctx: impl SubsystemContext<Message = AvailabilityRecoveryMessage>,
-	) -> SubsystemResult<()> {
+		mut ctx: Context,
+	) -> SubsystemResult<()>
+	where
+		Context: SubsystemContext<Message = AvailabilityRecoveryMessage>,
+		Context: overseer::SubsystemContext<Message = AvailabilityRecoveryMessage>,
+	{
 		let mut state = State::default();
 
 		loop {

polkadot/node/network/availability-recovery/src/tests.rs

@@ -34,7 +34,7 @@ use polkadot_erasure_coding::{branches, obtain_chunks_v1 as obtain_chunks};
 use polkadot_node_subsystem_util::TimeoutExt;
 use polkadot_subsystem_testhelpers as test_helpers;
 use polkadot_subsystem::{
-	messages::{RuntimeApiMessage, RuntimeApiRequest}, jaeger, ActivatedLeaf, LeafStatus,
+	messages::{AllMessages, RuntimeApiMessage, RuntimeApiRequest}, jaeger, ActivatedLeaf, LeafStatus,
 };
 
 type VirtualOverseer = test_helpers::TestSubsystemContextHandle<AvailabilityRecoveryMessage>;