merge approval-checking feature back into real-overseer (#2518)

polkadot/node/service/src/lib.rs

@@ -418,10 +418,10 @@ where
 	use polkadot_availability_recovery::AvailabilityRecoverySubsystem;
 	use polkadot_approval_distribution::ApprovalDistribution as ApprovalDistributionSubsystem;
 
-	#[cfg(feature = "approval-checking")]
+	#[cfg(feature = "real-overseer")]
 	use polkadot_node_core_approval_voting::ApprovalVotingSubsystem;
 
-	#[cfg(not(feature = "approval-checking"))]
+	#[cfg(not(feature = "real-overseer"))]
 	let _ = approval_voting_config; // silence.
 
 	let all_subsystems = AllSubsystems {
@@ -498,12 +498,12 @@ where
 		approval_distribution: ApprovalDistributionSubsystem::new(
 			Metrics::register(registry)?,
 		),
-		#[cfg(feature = "approval-checking")]
+		#[cfg(feature = "real-overseer")]
 		approval_voting: ApprovalVotingSubsystem::with_config(
 			approval_voting_config,
 			keystore.clone(),
 		)?,
-		#[cfg(not(feature = "approval-checking"))]
+		#[cfg(not(feature = "real-overseer"))]
 		approval_voting: polkadot_subsystem::DummySubsystem,
 	};
 
@@ -848,7 +848,7 @@ pub fn new_full<RuntimeApi, Executor>(
 		// given delay.
 		let builder = grandpa::VotingRulesBuilder::default();
 
-		#[cfg(feature = "approval-checking")]
+		#[cfg(feature = "real-overseer")]
 		let builder = if let Some(ref overseer) = overseer_handler {
 			builder.add(grandpa_support::ApprovalCheckingDiagnostic::new(
 				overseer.clone(),