Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Enable BEEFY explicitly #4320

Merged
merged 2 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ pub struct RunCmd {
#[structopt(long = "grandpa-pause", number_of_values(2))]
pub grandpa_pause: Vec<u32>,

/// Disable BEEFY gadget.
/// Enable the BEEFY gadget (only on Rococo or Wococo for now).
#[structopt(long)]
pub no_beefy: bool,
pub beefy: bool,

/// Add the destination address to the jaeger agent.
///
Expand Down
2 changes: 1 addition & 1 deletion cli/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ fn run_node_inner(cli: Cli, overseer_gen: impl service::OverseerGen) -> Result<(
config,
service::IsCollator::No,
grandpa_pause,
cli.run.no_beefy,
cli.run.beefy,
jaeger_agent,
None,
overseer_gen,
Expand Down
14 changes: 7 additions & 7 deletions node/service/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ pub fn new_full<RuntimeApi, ExecutorDispatch, OverseerGenerator>(
mut config: Configuration,
is_collator: IsCollator,
grandpa_pause: Option<(u32, u32)>,
disable_beefy: bool,
enable_beefy: bool,
jaeger_agent: Option<std::net::SocketAddr>,
telemetry_worker_handle: Option<TelemetryWorkerHandle>,
program_path: Option<std::path::PathBuf>,
Expand Down Expand Up @@ -1053,7 +1053,7 @@ where
if role.is_authority() { Some(keystore_container.sync_keystore()) } else { None };

// We currently only run the BEEFY gadget on the Rococo and Wococo testnets.
ordian marked this conversation as resolved.
Show resolved Hide resolved
if !disable_beefy && (chain_spec.is_rococo() || chain_spec.is_wococo()) {
if enable_beefy && (chain_spec.is_rococo() || chain_spec.is_wococo()) {
let beefy_params = beefy_gadget::BeefyParams {
client: client.clone(),
backend: backend.clone(),
Expand Down Expand Up @@ -1211,7 +1211,7 @@ pub fn build_full(
config: Configuration,
is_collator: IsCollator,
grandpa_pause: Option<(u32, u32)>,
disable_beefy: bool,
enable_beefy: bool,
jaeger_agent: Option<std::net::SocketAddr>,
telemetry_worker_handle: Option<TelemetryWorkerHandle>,
overseer_gen: impl OverseerGen,
Expand All @@ -1222,7 +1222,7 @@ pub fn build_full(
config,
is_collator,
grandpa_pause,
disable_beefy,
enable_beefy,
jaeger_agent,
telemetry_worker_handle,
None,
Expand All @@ -1237,7 +1237,7 @@ pub fn build_full(
config,
is_collator,
grandpa_pause,
disable_beefy,
enable_beefy,
jaeger_agent,
telemetry_worker_handle,
None,
Expand All @@ -1252,7 +1252,7 @@ pub fn build_full(
config,
is_collator,
grandpa_pause,
disable_beefy,
enable_beefy,
jaeger_agent,
telemetry_worker_handle,
None,
Expand All @@ -1267,7 +1267,7 @@ pub fn build_full(
config,
is_collator,
grandpa_pause,
disable_beefy,
enable_beefy,
jaeger_agent,
telemetry_worker_handle,
None,
Expand Down