simplify

node/core/candidate-validation/src/lib.rs

@@ -71,7 +71,8 @@ pub struct Config {
 pub struct CandidateValidationSubsystem {
 	#[allow(missing_docs)]
 	pub metrics: Metrics,
-	pvf_metrics: polkadot_node_core_pvf::Metrics,
+	#[allow(missing_docs)]
+	pub pvf_metrics: polkadot_node_core_pvf::Metrics,
 	config: Config,
 }
 

node/malus/src/variant-a.rs

@@ -34,9 +34,8 @@ use polkadot_cli::{
 
 // Import extra types relevant to the particular
 // subsystem.
-use polkadot_node_core_candidate_validation::{CandidateValidationSubsystem, Metrics};
+use polkadot_node_core_candidate_validation::CandidateValidationSubsystem;
 use polkadot_node_subsystem::messages::CandidateValidationMessage;
-use polkadot_node_subsystem_util::metrics::Metrics as _;
 
 // Filter wrapping related types.
 use malus::*;
@@ -89,14 +88,14 @@ impl OverseerGen for BehaveMaleficient {
 		let all_subsystems = create_default_subsystems(args)?.replace_candidate_validation(
 			// create the filtered subsystem
 			|orig: CandidateValidationSubsystem| {
-				Ok(FilteredSubsystem::new(
+				FilteredSubsystem::new(
 					CandidateValidationSubsystem::with_config(
 						candidate_validation_config,
-						Metrics::register(registry)?,
 						orig.metrics,
+						orig.pvf_metrics,
 					),
 					Skippy::default(),
-				))
+				)
 			},
 		);
 

node/overseer/all-subsystems-gen/src/lib.rs

@@ -156,7 +156,8 @@ fn impl_subsystems_gen(item: TokenStream) -> Result<proc_macro2::TokenStream> {
 					impl #orig_generics #strukt_ty #orig_generics {
 						#[doc = #msg]
 						pub fn #fname < NEW, F > (self, gen_replacement_fn: F) -> #strukt_ty #modified_generics
-							where F: FnOnce(#replacable_item_ty) -> NEW,
+							where
+								F: FnOnce(#replacable_item_ty) -> NEW,
 						{
 							let Self {
 								// To be replaced field:

node/overseer/examples/minimal-example.rs

@@ -170,8 +170,8 @@ fn main() {
 		});
 
 		let all_subsystems = AllSubsystems::<()>::dummy()
-			.replace_candidate_validation(|_| Subsystem2)
-			.replace_candidate_backing(|orig| orig);
+			.replace_candidate_validation(|_| Ok(Subsystem2))
+			.replace_candidate_backing(|orig| Ok(orig));
 
 		let (overseer, _handle) =
 			Overseer::new(vec![], all_subsystems, None, AlwaysSupportsParachains, spawner).unwrap();