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

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

This reverts commit 26adab4f7c.

* update lockfile for {"substrate"}

* fix merge damage

---------

Co-authored-by: parity-processbot <>

polkadot/node/service/src/lib.rs

@@ -629,6 +629,7 @@ where
 pub struct NewFullParams<OverseerGenerator: OverseerGen> {
 	pub is_parachain_node: IsParachainNode,
 	pub grandpa_pause: Option<(u32, u32)>,
+	pub enable_beefy: bool,
 	pub jaeger_agent: Option<std::net::SocketAddr>,
 	pub telemetry_worker_handle: Option<TelemetryWorkerHandle>,
 	/// The version of the node. TESTING ONLY: `None` can be passed to skip the node/worker version
@@ -719,6 +720,7 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 	NewFullParams {
 		is_parachain_node,
 		grandpa_pause,
+		enable_beefy,
 		jaeger_agent,
 		telemetry_worker_handle,
 		node_version,
@@ -752,7 +754,6 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
 		Some(backoff)
 	};
 
-	let enable_beefy = !config.disable_beefy;
 	// If not on a known test network, warn the user that BEEFY is still experimental.
 	if enable_beefy &&
 		!config.chain_spec.is_rococo() &&

polkadot/node/test/service/src/lib.rs

@@ -81,6 +81,7 @@ pub fn new_full(
 		polkadot_service::NewFullParams {
 			is_parachain_node,
 			grandpa_pause: None,
+			enable_beefy: true,
 			jaeger_agent: None,
 			telemetry_worker_handle: None,
 			node_version: None,
@@ -186,7 +187,6 @@ pub fn node_config(
 		offchain_worker: Default::default(),
 		force_authoring: false,
 		disable_grandpa: false,
-		disable_beefy: false,
 		dev_key_seed: Some(key_seed),
 		tracing_targets: None,
 		tracing_receiver: Default::default(),