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 <>
This commit is contained in:
Adrian Catangiu
2023-08-15 19:06:07 +03:00
committed by GitHub
parent bf785881ac
commit 022a3b97f3
7 changed files with 204 additions and 193 deletions
+2 -1
View File
@@ -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() &&