remove AllSubsystems and AllSubsystemsGen types

Cargo.toml

@@ -73,7 +73,6 @@ members = [
 	"node/overseer",
 	"node/overseer/overseer-gen",
 	"node/overseer/overseer-gen/proc-macro",
-	"node/overseer/all-subsystems-gen",
 	"node/malus",
 	"node/primitives",
 	"node/service",

cli/src/lib.rs

@@ -29,7 +29,7 @@ pub use service::RuntimeApiCollection;
 pub use service::{self, Block, CoreApi, IdentifyVariant, ProvideRuntimeApi, TFullClient};
 
 #[cfg(feature = "malus")]
-pub use service::create_default_subsystems;
+pub use service::overseer::prepared_overseer_builder;
 
 #[cfg(feature = "cli")]
 pub use cli::*;

node/core/pvf/src/artifacts.rs

@@ -150,7 +150,7 @@ impl Artifacts {
 
 	/// Inform the table about the artifact with the given ID. The state will be set to "preparing".
 	///
-	/// This function must be used only for brand new artifacts and should never be used for
+	/// This function must be used only for brand-new artifacts and should never be used for
 	/// replacing existing ones.
 	pub fn insert_preparing(&mut self, artifact_id: ArtifactId) {
 		// See the precondition.
@@ -159,7 +159,7 @@ impl Artifacts {
 
 	/// Insert an artifact with the given ID as "prepared".
 	///
-	/// This function must be used only for brand new artifacts and should never be used for
+	/// This function must be used only for brand-new artifacts and should never be used for
 	/// replacing existing ones.
 	#[cfg(test)]
 	pub fn insert_prepared(&mut self, artifact_id: ArtifactId, last_time_needed: SystemTime) {

node/malus/src/variant-a.rs

@@ -24,10 +24,10 @@
 
 use color_eyre::eyre;
 use polkadot_cli::{
-	create_default_subsystems,
+	prepared_overseer_builder,
 	service::{
-		AuthorityDiscoveryApi, AuxStore, BabeApi, Block, Error, HeaderBackend, Overseer,
-		OverseerGen, OverseerGenArgs, ParachainHost, ProvideRuntimeApi, SpawnNamed,
+		AuthorityDiscoveryApi, AuxStore, BabeApi, Block, Error, HeaderBackend, OverseerGen,
+		OverseerGenArgs, ParachainHost, ProvideRuntimeApi, SpawnNamed,
 	},
 	Cli,
 };
@@ -37,7 +37,7 @@ use polkadot_cli::{
 use polkadot_node_core_candidate_validation::CandidateValidationSubsystem;
 use polkadot_node_subsystem::{
 	messages::{AllMessages, CandidateValidationMessage},
-	overseer::{self, OverseerConnector, OverseerHandle},
+	overseer::{self, Overseer, OverseerConnector, OverseerHandle},
 	FromOverseer,
 };
 
@@ -94,15 +94,10 @@ impl OverseerGen for BehaveMaleficient {
 		RuntimeClient::Api: ParachainHost<Block> + BabeApi<Block> + AuthorityDiscoveryApi<Block>,
 		Spawner: 'static + SpawnNamed + Clone + Unpin,
 	{
-		let spawner = args.spawner.clone();
-		let leaves = args.leaves.clone();
-		let runtime_client = args.runtime_client.clone();
-		let registry = args.registry.clone();
 		let candidate_validation_config = args.candidate_validation_config.clone();
-		// modify the subsystem(s) as needed:
-		let all_subsystems = create_default_subsystems(args)?.replace_candidate_validation(
-			// create the filtered subsystem
-			|orig: CandidateValidationSubsystem| {
+
+		prepared_overseer_builder(args)?
+			.replace_candidate_validation(|orig: CandidateValidationSubsystem| {
 				InterceptedSubsystem::new(
 					CandidateValidationSubsystem::with_config(
 						candidate_validation_config,
@@ -111,10 +106,8 @@ impl OverseerGen for BehaveMaleficient {
 					),
 					Skippy::default(),
 				)
-			},
-		);
-
-		Overseer::new(leaves, all_subsystems, registry, runtime_client, spawner, connector)
+			})
+			.build_with_connector(connector)
 			.map_err(|e| e.into())
 	}
 }

node/network/availability-distribution/src/requester/session_cache.rs

@@ -56,7 +56,7 @@ pub struct SessionInfo {
 	/// validators.
 	pub validator_groups: Vec<Vec<AuthorityDiscoveryId>>,
 
-	/// Information about ourself:
+	/// Information about ourselves:
 	pub our_index: ValidatorIndex,
 
 	/// Remember to which group we belong, so we won't start fetching chunks for candidates with

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

@@ -18,7 +18,7 @@
 //! futures will still get polled, but will not count towards length. So length will only count
 //! futures, which are still considered live.
 //!
-//! Usecase: If futures take longer than we would like them too, we maybe able to request the data
+//! Usecase: If futures take longer than we would like them too, we may be able to request the data
 //! from somewhere else as well. We don't really want to cancel the old future, because maybe it
 //! was almost done, thus we would have wasted time with our impatience. By simply making them
 //! not count towards length, we can make sure to have enough "live" requests ongoing, while at the

node/network/dispute-distribution/src/error.rs

@@ -29,7 +29,7 @@ use crate::{sender, LOG_TARGET};
 pub enum Error {
 	/// Fatal errors of dispute distribution.
 	Fatal(Fatal),
-	/// Non fatal errors of dispute distribution.
+	/// Non-fatal errors of dispute distribution.
 	NonFatal(NonFatal),
 }
 

node/network/statement-distribution/src/error.rs

@@ -39,7 +39,7 @@ pub type FatalResult<T> = std::result::Result<T, Fatal>;
 pub enum Error {
 	/// Fatal errors of dispute distribution.
 	Fatal(Fatal),
-	/// Non fatal errors of dispute distribution.
+	/// Non-fatal errors of dispute distribution.
 	NonFatal(NonFatal),
 }
 

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

@@ -105,7 +105,7 @@ const MAX_LARGE_STATEMENTS_PER_SENDER: usize = 20;
 
 /// The statement distribution subsystem.
 pub struct StatementDistribution {
-	/// Pointer to a keystore, which is required for determining this nodes validator index.
+	/// Pointer to a keystore, which is required for determining the nodes validator index.
 	keystore: SyncCryptoStorePtr,
 	/// Receiver for incoming large statement requests.
 	req_receiver: Option<IncomingRequestReceiver<request_v1::StatementFetchingRequest>>,

node/overseer/Cargo.toml

@@ -16,7 +16,6 @@ polkadot-node-subsystem-types = { path = "../subsystem-types" }
 polkadot-node-metrics = { path = "../metrics" }
 polkadot-primitives = { path = "../../primitives" }
 polkadot-overseer-gen = { path = "./overseer-gen" }
-polkadot-overseer-all-subsystems-gen = { path = "./all-subsystems-gen" }
 tracing = "0.1.28"
 lru = "0.6"
 parity-util-mem = { version = ">= 0.10.1", default-features = false }