move to new generated trait bounds, not compiling yet

node/core/runtime-api/src/lib.rs

@@ -94,12 +94,7 @@ impl<Client, Context> overseer::Subsystem<Context, SubsystemError> for RuntimeAp
 where
 	Client: ProvideRuntimeApi<Block> + Send + 'static + Sync,
 	Client::Api: ParachainHost<Block> + BabeApi<Block> + AuthorityDiscoveryApi<Block>,
-	Context: overseer::SubsystemContext<
-		Message = RuntimeApiMessage,
-		OutgoingMessages = overseer::RuntimeApiOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::RuntimeApiContextTrait,
 {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		SpawnedSubsystem { future: run(ctx, self).boxed(), name: "runtime-api-subsystem" }
@@ -338,12 +333,7 @@ async fn run<Client, Context>(
 where
 	Client: ProvideRuntimeApi<Block> + Send + Sync + 'static,
 	Client::Api: ParachainHost<Block> + BabeApi<Block> + AuthorityDiscoveryApi<Block>,
-	Context: overseer::SubsystemContext<
-		Message = RuntimeApiMessage,
-		OutgoingMessages = overseer::RuntimeApiOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::RuntimeApiContextTrait,
 {
 	loop {
 		select! {

node/network/approval-distribution/src/lib.rs

@@ -1622,12 +1622,7 @@ async fn adjust_required_routing_and_propagate(
 
 /// Modify the reputation of a peer based on its behavior.
 async fn modify_reputation(
-	ctx: &mut impl overseer::SubsystemContext<
-		Message = ApprovalDistributionMessage,
-		OutgoingMessages = overseer::ApprovalDistributionOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	ctx: &mut impl overseer::ApprovalDistributionContextTrait,
 	peer_id: PeerId,
 	rep: Rep,
 ) {
@@ -1765,12 +1760,7 @@ impl ApprovalDistribution {
 
 impl<Context> overseer::Subsystem<Context, SubsystemError> for ApprovalDistribution
 where
-	Context: overseer::SubsystemContext<
-		Message = ApprovalDistributionMessage,
-		OutgoingMessages = overseer::ApprovalDistributionOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::ApprovalDistributionContextTrait,
 {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = self.run(ctx).map(|_| Ok(())).boxed();

node/network/availability-distribution/src/lib.rs

@@ -70,12 +70,7 @@ pub struct IncomingRequestReceivers {
 
 impl<Context> overseer::Subsystem<Context, SubsystemError> for AvailabilityDistributionSubsystem
 where
-	Context: overseer::SubsystemContext<
-		Message = AvailabilityDistributionMessage,
-		OutgoingMessages = overseer::AvailabilityDistributionOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::AvailabilityDistributionContextTrait,
 {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = self

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

@@ -177,7 +177,7 @@ impl RequestFromBackers {
 	async fn run(
 		&mut self,
 		params: &RecoveryParams,
-		sender: &mut impl SubsystemSender,
+		sender: &mut impl SubsystemSender<RuntimeApiMessage>,
 	) -> Result<AvailableData, RecoveryError> {
 		gum::trace!(
 			target: LOG_TARGET,
@@ -301,7 +301,7 @@ impl RequestChunksFromValidators {
 	async fn launch_parallel_requests(
 		&mut self,
 		params: &RecoveryParams,
-		sender: &mut impl SubsystemSender,
+		sender: &mut impl SubsystemSender<RuntimeApiMessage>,
 	) {
 		let num_requests = self.get_desired_request_count(params.threshold);
 		let candidate_hash = &params.candidate_hash;
@@ -476,7 +476,7 @@ impl RequestChunksFromValidators {
 	async fn run(
 		&mut self,
 		params: &RecoveryParams,
-		sender: &mut impl SubsystemSender,
+		sender: &mut impl SubsystemSender<RuntimeApiMessage>,
 	) -> Result<AvailableData, RecoveryError> {
 		let metrics = &params.metrics;
 
@@ -791,12 +791,7 @@ impl Default for State {
 
 impl<Context> Subsystem<Context, SubsystemError> for AvailabilityRecoverySubsystem
 where
-	Context: overseer::SubsystemContext<
-		Message = AvailabilityRecoveryMessage,
-		OutgoingMessages = overseer::AvailabilityRecoveryOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::AvailabilityRecoveryContextTrait,
 {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = self
@@ -836,12 +831,7 @@ async fn launch_recovery_task<Context>(
 	metrics: &Metrics,
 ) -> error::Result<()>
 where
-	Context: overseer::SubsystemContext<
-		Message = AvailabilityRecoveryMessage,
-		OutgoingMessages = overseer::AvailabilityRecoveryOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::AvailabilityRecoveryContextTrait,
 {
 	let candidate_hash = receipt.hash();
 
@@ -893,12 +883,7 @@ async fn handle_recover<Context>(
 	metrics: &Metrics,
 ) -> error::Result<()>
 where
-	Context: overseer::SubsystemContext<
-		Message = AvailabilityRecoveryMessage,
-		OutgoingMessages = overseer::AvailabilityRecoveryOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::AvailabilityRecoveryContextTrait,
 {
 	let candidate_hash = receipt.hash();
 
@@ -960,12 +945,7 @@ async fn query_full_data<Context>(
 	candidate_hash: CandidateHash,
 ) -> error::Result<Option<AvailableData>>
 where
-	Context: overseer::SubsystemContext<
-		Message = AvailabilityRecoveryMessage,
-		OutgoingMessages = overseer::AvailabilityRecoveryOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::AvailabilityRecoveryContextTrait,
 {
 	let (tx, rx) = oneshot::channel();
 	ctx.send_message(AvailabilityStoreMessage::QueryAvailableData(candidate_hash, tx))

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

@@ -666,12 +666,7 @@ async fn send_tracked_gossip_message<Context>(
 
 impl<Context> overseer::Subsystem<Context, SubsystemError> for BitfieldDistribution
 where
-	Context: overseer::SubsystemContext<
-		Message = BitfieldDistributionMessage,
-		OutgoingMessages = overseer::BitfieldDistributionOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::BitfieldDistributionContextTrait,
 {
 	fn start(self, ctx: Context) -> SpawnedSubsystem {
 		let future = self.run(ctx).map(|_| Ok(())).boxed();

node/network/bridge/src/lib.rs

@@ -395,12 +395,7 @@ async fn handle_subsystem_messages<Context, N, AD>(
 	metrics: Metrics,
 ) -> Result<(), UnexpectedAbort>
 where
-	Context: overseer::SubsystemContext<
-		Message = NetworkBridgeMessage,
-		OutgoingMessages = overseer::NetworkBridgeOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::NetworkBridgeContextTrait,
 	N: Network,
 	AD: validator_discovery::AuthorityDiscovery + Clone,
 {
@@ -1047,12 +1042,7 @@ async fn run_network<N, AD, Context>(
 where
 	N: Network,
 	AD: validator_discovery::AuthorityDiscovery + Clone,
-	Context: overseer::SubsystemContext<
-		Message = NetworkBridgeMessage,
-		OutgoingMessages = overseer::NetworkBridgeOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::NetworkBridgeContextTrait,
 {
 	let shared = Shared::default();
 

node/network/collator-protocol/src/collator_side/mod.rs

@@ -370,12 +370,7 @@ async fn distribute_collation<Context>(
 	result_sender: Option<oneshot::Sender<CollationSecondedSignal>>,
 ) -> Result<()>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	let relay_parent = receipt.descriptor.relay_parent;
 
@@ -471,12 +466,7 @@ async fn determine_core<Context>(
 	relay_parent: Hash,
 ) -> Result<Option<(CoreIndex, usize)>>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	let cores = get_availability_cores(sender, relay_parent).await?;
 
@@ -509,12 +499,7 @@ async fn determine_our_validators<Context>(
 	relay_parent: Hash,
 ) -> Result<GroupValidators>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	let session_index = runtime.get_session_index_for_child(ctx.sender(), relay_parent).await?;
 	let info = &runtime
@@ -544,12 +529,7 @@ where
 /// Issue a `Declare` collation message to the given `peer`.
 async fn declare<Context>(ctx: &mut Context, state: &mut State, peer: PeerId)
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	let declare_signature_payload = protocol_v1::declare_signature_payload(&state.local_peer_id);
 
@@ -572,12 +552,7 @@ where
 /// revoke the previous connection request.
 async fn connect_to_validators<Context>(ctx: &mut Context, validator_ids: Vec<AuthorityDiscoveryId>)
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	// ignore address resolution failure
 	// will reissue a new request on new collation
@@ -600,12 +575,7 @@ async fn advertise_collation<Context>(
 	relay_parent: Hash,
 	peer: PeerId,
 ) where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	let should_advertise = state
 		.our_validators_groups
@@ -666,12 +636,7 @@ async fn process_msg<Context>(
 	msg: CollatorProtocolMessage,
 ) -> Result<()>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	use CollatorProtocolMessage::*;
 
@@ -784,12 +749,7 @@ async fn handle_incoming_peer_message<Context>(
 	msg: protocol_v1::CollatorProtocolMessage,
 ) -> Result<()>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	use protocol_v1::CollatorProtocolMessage::*;
 
@@ -869,12 +829,7 @@ async fn handle_incoming_request<Context>(
 	req: IncomingRequest<request_v1::CollationFetchingRequest>,
 ) -> Result<()>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	let _span = state
 		.span_per_relay_parent
@@ -949,12 +904,7 @@ async fn handle_peer_view_change<Context>(
 	peer_id: PeerId,
 	view: View,
 ) where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	let current = state.peer_views.entry(peer_id.clone()).or_default();
 
@@ -975,12 +925,7 @@ async fn handle_network_msg<Context>(
 	bridge_message: NetworkBridgeEvent<net_protocol::CollatorProtocolMessage>,
 ) -> Result<()>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	use NetworkBridgeEvent::*;
 
@@ -1073,12 +1018,7 @@ pub(crate) async fn run<Context>(
 	metrics: Metrics,
 ) -> std::result::Result<(), FatalError>
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 {
 	use OverseerSignal::*;
 

node/network/collator-protocol/src/lib.rs

@@ -118,12 +118,7 @@ impl CollatorProtocolSubsystem {
 
 impl<Context> overseer::Subsystem<Context, SubsystemError> for CollatorProtocolSubsystem
 where
-	Context: overseer::SubsystemContext<
-		Message = CollatorProtocolMessage,
-		OutgoingMessages = overseer::CollatorProtocolOutgoingMessages,
-		Signal = OverseerSignal,
-		Error = SubsystemError,
-	>,
+	Context: overseer::CollatorProtocolContextTrait,
 	<Context as SubsystemContext>::Sender:
 		SubsystemSender<overseer::CollatorProtocolMessageOutgoingMessages>,
 {