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

companion for 14754: cli: move no-beefy flag to sc-cli #7600

Merged
merged 2 commits into from
Aug 11, 2023
Merged

companion for 14754: cli: move no-beefy flag to sc-cli #7600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b35f10
cli: move no-beefy flag to substrate sc-cli config
acatangiu Aug 11, 2023
2a64ca8
bump substrate ref
acatangiu Aug 11, 2023
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
368 changes: 184 additions & 184 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions cli/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,6 @@ pub struct RunCmd {
#[arg(long = "grandpa-pause", num_args = 2)]
pub grandpa_pause: Vec<u32>,

/// Disable the BEEFY gadget
/// (currently enabled by default on Rococo, Wococo and Versi).
#[arg(long)]
pub no_beefy: bool,

/// Add the destination address to the jaeger agent.
///
/// Must be valid socket address, of format `IP:Port`
Expand Down
11 changes: 5 additions & 6 deletions cli/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,11 @@ fn run_node_inner<F>(
where
F: FnOnce(&mut sc_cli::LoggerBuilder, &sc_service::Configuration),
{
let runner = cli
let mut runner = cli
.create_runner_with_logger_hook::<sc_cli::RunCmd, F>(&cli.run.base, logger_hook)
.map_err(Error::from)?;
let chain_spec = &runner.config().chain_spec;

// By default, enable BEEFY on test networks.
let enable_beefy = (chain_spec.is_rococo() || chain_spec.is_wococo() || chain_spec.is_versi()) &&
!cli.run.no_beefy;

set_default_ss58_version(chain_spec);

let grandpa_pause = if cli.run.grandpa_pause.is_empty() {
Expand All @@ -259,6 +255,10 @@ where
info!(" KUSAMA FOUNDATION ");
info!("----------------------------");
}
// BEEFY allowed only on test networks.
if !(chain_spec.is_rococo() || chain_spec.is_wococo() || chain_spec.is_versi()) {
runner.config_mut().disable_beefy = true;
}

let jaeger_agent = if let Some(ref jaeger_agent) = cli.run.jaeger_agent {
Some(
Expand Down Expand Up @@ -289,7 +289,6 @@ where
service::NewFullParams {
is_collator: service::IsCollator::No,
grandpa_pause,
enable_beefy,
jaeger_agent,
telemetry_worker_handle: None,
node_version,
Expand Down
3 changes: 1 addition & 2 deletions node/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,6 @@ where
pub struct NewFullParams<OverseerGenerator: OverseerGen> {
pub is_collator: IsCollator,
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
Expand Down Expand Up @@ -711,7 +710,6 @@ pub fn new_full<OverseerGenerator: OverseerGen>(
NewFullParams {
is_collator,
grandpa_pause,
enable_beefy,
jaeger_agent,
telemetry_worker_handle,
node_version,
Expand Down Expand Up @@ -746,6 +744,7 @@ 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() &&
Expand Down
2 changes: 1 addition & 1 deletion node/test/service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ pub fn new_full(
polkadot_service::NewFullParams {
is_collator,
grandpa_pause: None,
enable_beefy: true,
jaeger_agent: None,
telemetry_worker_handle: None,
node_version: None,
Expand Down Expand Up @@ -188,6 +187,7 @@ 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(),
Expand Down
4 changes: 2 additions & 2 deletions parachain/test-parachains/adder/collator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ fn main() -> Result<()> {
)
})?;

runner.run_node_until_exit(|config| async move {
runner.run_node_until_exit(|mut config| async move {
let collator = Collator::new();

config.disable_beefy = true;
let full_node = polkadot_service::build_full(
config,
polkadot_service::NewFullParams {
is_collator: polkadot_service::IsCollator::Yes(collator.collator_key()),
grandpa_pause: None,
enable_beefy: false,
jaeger_agent: None,
telemetry_worker_handle: None,

Expand Down
4 changes: 2 additions & 2 deletions parachain/test-parachains/undying/collator/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ fn main() -> Result<()> {
)
})?;

runner.run_node_until_exit(|config| async move {
runner.run_node_until_exit(|mut config| async move {
let collator = Collator::new(cli.run.pov_size, cli.run.pvf_complexity);

config.disable_beefy = true;
let full_node = polkadot_service::build_full(
config,
polkadot_service::NewFullParams {
is_collator: polkadot_service::IsCollator::Yes(collator.collator_key()),
grandpa_pause: None,
enable_beefy: false,
jaeger_agent: None,
telemetry_worker_handle: None,

Expand Down