diff --git a/substrate/bin/node/cli/benches/block_production.rs b/substrate/bin/node/cli/benches/block_production.rs index fd4deeaed3..5ee538d18d 100644 --- a/substrate/bin/node/cli/benches/block_production.rs +++ b/substrate/bin/node/cli/benches/block_production.rs @@ -88,7 +88,6 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase { offchain_worker: OffchainWorkerConfig { enabled: true, indexing_enabled: false }, force_authoring: false, disable_grandpa: false, - disable_beefy: false, dev_key_seed: Some(Sr25519Keyring::Alice.to_seed()), tracing_targets: None, tracing_receiver: Default::default(), diff --git a/substrate/bin/node/cli/benches/transaction_pool.rs b/substrate/bin/node/cli/benches/transaction_pool.rs index 39a94b21cc..d3e8c02a95 100644 --- a/substrate/bin/node/cli/benches/transaction_pool.rs +++ b/substrate/bin/node/cli/benches/transaction_pool.rs @@ -84,7 +84,6 @@ fn new_node(tokio_handle: Handle) -> node_cli::service::NewFullBase { offchain_worker: OffchainWorkerConfig { enabled: true, indexing_enabled: false }, force_authoring: false, disable_grandpa: false, - disable_beefy: false, dev_key_seed: Some(Sr25519Keyring::Alice.to_seed()), tracing_targets: None, tracing_receiver: Default::default(), diff --git a/substrate/client/cli/src/commands/run_cmd.rs b/substrate/client/cli/src/commands/run_cmd.rs index e6a6218517..5dda488b13 100644 --- a/substrate/client/cli/src/commands/run_cmd.rs +++ b/substrate/client/cli/src/commands/run_cmd.rs @@ -51,10 +51,6 @@ pub struct RunCmd { #[arg(long)] pub no_grandpa: bool, - /// Disable BEEFY voter when running in validator mode, otherwise disable the BEEFY observer. - #[arg(long)] - pub no_beefy: bool, - /// Listen to all RPC interfaces. /// Default is local. Note: not all RPC methods are safe to be exposed publicly. Use an RPC /// proxy server to filter out dangerous methods. More details: @@ -317,10 +313,6 @@ impl CliConfiguration for RunCmd { Ok(self.no_grandpa) } - fn disable_beefy(&self) -> Result { - Ok(self.no_beefy) - } - fn rpc_max_connections(&self) -> Result { Ok(self.rpc_max_connections) } diff --git a/substrate/client/cli/src/config.rs b/substrate/client/cli/src/config.rs index 0c3bf98a2f..4d218da6aa 100644 --- a/substrate/client/cli/src/config.rs +++ b/substrate/client/cli/src/config.rs @@ -381,13 +381,6 @@ pub trait CliConfiguration: Sized { Ok(Default::default()) } - /// Returns `Ok(true)` if BEEFY should be disabled - /// - /// By default this is `false`. - fn disable_beefy(&self) -> Result { - Ok(Default::default()) - } - /// Get the development key seed from the current object /// /// By default this is `None`. @@ -515,7 +508,6 @@ pub trait CliConfiguration: Sized { offchain_worker: self.offchain_worker(&role)?, force_authoring: self.force_authoring()?, disable_grandpa: self.disable_grandpa()?, - disable_beefy: self.disable_beefy()?, dev_key_seed: self.dev_key_seed(is_dev)?, tracing_targets: self.tracing_targets()?, tracing_receiver: self.tracing_receiver()?, diff --git a/substrate/client/cli/src/runner.rs b/substrate/client/cli/src/runner.rs index 2a536044d2..59f53200a1 100644 --- a/substrate/client/cli/src/runner.rs +++ b/substrate/client/cli/src/runner.rs @@ -280,7 +280,6 @@ mod tests { offchain_worker: Default::default(), force_authoring: false, disable_grandpa: false, - disable_beefy: false, dev_key_seed: None, tracing_targets: None, tracing_receiver: Default::default(), diff --git a/substrate/client/service/src/config.rs b/substrate/client/service/src/config.rs index abf5458855..39b7ee0507 100644 --- a/substrate/client/service/src/config.rs +++ b/substrate/client/service/src/config.rs @@ -112,8 +112,6 @@ pub struct Configuration { pub force_authoring: bool, /// Disable GRANDPA when running in validator mode pub disable_grandpa: bool, - /// Disable BEEFY when running in validator mode - pub disable_beefy: bool, /// Development key seed. /// /// When running in development mode, the seed will be used to generate authority keys by the diff --git a/substrate/client/service/test/src/lib.rs b/substrate/client/service/test/src/lib.rs index e095f61a7d..38a811acc7 100644 --- a/substrate/client/service/test/src/lib.rs +++ b/substrate/client/service/test/src/lib.rs @@ -260,7 +260,6 @@ fn node_config< offchain_worker: Default::default(), force_authoring: false, disable_grandpa: false, - disable_beefy: false, dev_key_seed: key_seed, tracing_targets: None, tracing_receiver: Default::default(),