companion for 14754: cli: move no-beefy flag to sc-cli (#2996)

* companion 14754: no-beefy flag moved to sc-cli Signed-off-by: Adrian Catangiu <[email protected]> * bump substrate ref Signed-off-by: Adrian Catangiu <[email protected]> * bump polkadot ref --------- Signed-off-by: Adrian Catangiu <[email protected]>
paritytech · Aug 11, 2023 · 9afe6a0 · 9afe6a0
1 parent 5a90e29
commit 9afe6a0
Show file tree

Hide file tree

Showing 7 changed files with 285 additions and 267 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs
@@ -393,6 +393,10 @@ impl sc_cli::CliConfiguration for NormalizedRunCmd {
 		self.base.disable_grandpa()
 	}
 
+	fn disable_beefy(&self) -> sc_cli::Result<bool> {
+		self.base.disable_beefy()
+	}
+
 	fn rpc_max_connections(&self) -> sc_cli::Result<u32> {
 		self.base.rpc_max_connections()
 	}

diff --git a/client/relay-chain-inprocess-interface/src/lib.rs b/client/relay-chain-inprocess-interface/src/lib.rs
@@ -265,7 +265,7 @@ pub fn check_block_in_chain(
 /// Build the Polkadot full node using the given `config`.
 #[sc_tracing::logging::prefix_logs_with("Relaychain")]
 fn build_polkadot_full_node(
-	config: Configuration,
+	mut config: Configuration,
 	parachain_config: &Configuration,
 	telemetry_worker_handle: Option<TelemetryWorkerHandle>,
 	hwbench: Option<sc_sysinfo::HwBench>,
@@ -277,13 +277,14 @@ fn build_polkadot_full_node(
 		(polkadot_service::IsCollator::No, None)
 	};
 
+	// Disable BEEFY. It should not be required by the internal relay chain node.
+	config.disable_beefy = true;
+
 	let relay_chain_full_node = polkadot_service::build_full(
 		config,
 		polkadot_service::NewFullParams {
 			is_collator,
 			grandpa_pause: None,
-			// Disable BEEFY. It should not be required by the internal relay chain node.
-			enable_beefy: false,
 			jaeger_agent: None,
 			telemetry_worker_handle,
 

diff --git a/parachain-template/node/src/command.rs b/parachain-template/node/src/command.rs
@@ -408,6 +408,10 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.disable_grandpa()
 	}
 
+	fn disable_beefy(&self) -> Result<bool> {
+		self.base.base.disable_beefy()
+	}
+
 	fn max_runtime_instances(&self) -> Result<Option<usize>> {
 		self.base.base.max_runtime_instances()
 	}

diff --git a/polkadot-parachain/src/command.rs b/polkadot-parachain/src/command.rs
@@ -1064,6 +1064,10 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.disable_grandpa()
 	}
 
+	fn disable_beefy(&self) -> Result<bool> {
+		self.base.base.disable_beefy()
+	}
+
 	fn max_runtime_instances(&self) -> Result<Option<usize>> {
 		self.base.base.max_runtime_instances()
 	}

diff --git a/test/service/src/cli.rs b/test/service/src/cli.rs
@@ -220,6 +220,10 @@ impl CliConfiguration<Self> for RelayChainCli {
 		self.base.base.disable_grandpa()
 	}
 
+	fn disable_beefy(&self) -> CliResult<bool> {
+		self.base.base.disable_beefy()
+	}
+
 	fn max_runtime_instances(&self) -> CliResult<Option<usize>> {
 		self.base.base.max_runtime_instances()
 	}

diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs
@@ -772,6 +772,7 @@ pub fn node_config(
 		offchain_worker: OffchainWorkerConfig { enabled: true, indexing_enabled: false },
 		force_authoring: false,
 		disable_grandpa: false,
+		disable_beefy: true,
 		dev_key_seed: Some(key_seed),
 		tracing_targets: None,
 		tracing_receiver: Default::default(),