Revert "companion for 14754: cli: move no-beefy flag to sc-cli (#2996)"

client/cli/src/lib.rs

@@ -394,10 +394,6 @@ impl sc_cli::CliConfiguration for NormalizedRunCmd {
 		self.base.disable_grandpa()
 	}
 
-	fn disable_beefy(&self) -> sc_cli::Result<bool> {
-		self.base.disable_beefy()
-	}
-
 	fn rpc_max_connections(&self) -> sc_cli::Result<u32> {
 		self.base.rpc_max_connections()
 	}

client/relay-chain-inprocess-interface/src/lib.rs

@@ -267,7 +267,7 @@ pub fn check_block_in_chain(
 /// Build the Polkadot full node using the given `config`.
 #[sc_tracing::logging::prefix_logs_with("Relaychain")]
 fn build_polkadot_full_node(
-	mut config: Configuration,
+	config: Configuration,
 	parachain_config: &Configuration,
 	telemetry_worker_handle: Option<TelemetryWorkerHandle>,
 	hwbench: Option<sc_sysinfo::HwBench>,
@@ -279,14 +279,13 @@ fn build_polkadot_full_node(
 		(polkadot_service::IsParachainNode::FullNode, None)
 	};
 
-	// Disable BEEFY. It should not be required by the internal relay chain node.
-	config.disable_beefy = true;
-
 	let relay_chain_full_node = polkadot_service::build_full(
 		config,
 		polkadot_service::NewFullParams {
 			is_parachain_node,
 			grandpa_pause: None,
+			// Disable BEEFY. It should not be required by the internal relay chain node.
+			enable_beefy: false,
 			jaeger_agent: None,
 			telemetry_worker_handle,
 

parachain-template/node/src/command.rs

@@ -408,10 +408,6 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.disable_grandpa()
 	}
 
-	fn disable_beefy(&self) -> Result<bool> {
-		self.base.base.disable_beefy()
-	}
-
 	fn max_runtime_instances(&self) -> Result<Option<usize>> {
 		self.base.base.max_runtime_instances()
 	}

polkadot-parachain/src/command.rs

@@ -1064,10 +1064,6 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.disable_grandpa()
 	}
 
-	fn disable_beefy(&self) -> Result<bool> {
-		self.base.base.disable_beefy()
-	}
-
 	fn max_runtime_instances(&self) -> Result<Option<usize>> {
 		self.base.base.max_runtime_instances()
 	}

test/service/src/cli.rs

@@ -220,10 +220,6 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.disable_grandpa()
 	}
 
-	fn disable_beefy(&self) -> CliResult<bool> {
-		self.base.base.disable_beefy()
-	}
-
 	fn max_runtime_instances(&self) -> CliResult<Option<usize>> {
 		self.base.base.max_runtime_instances()
 	}

test/service/src/lib.rs

@@ -773,7 +773,6 @@ pub fn node_config(
 		offchain_worker: OffchainWorkerConfig { enabled: true, indexing_enabled: false },
 		force_authoring: false,
 		disable_grandpa: false,
-		disable_beefy: true,
 		dev_key_seed: Some(key_seed),
 		tracing_targets: None,
 		tracing_receiver: Default::default(),