diff --git a/polkadot/cli/src/cli.rs b/polkadot/cli/src/cli.rs index 777bb9c60671244e56153cf666d8f4702d1abaf5..6187eb79a362c7a95a0516dcf10234336f6871b8 100644 --- a/polkadot/cli/src/cli.rs +++ b/polkadot/cli/src/cli.rs @@ -18,7 +18,7 @@ pub use polkadot_node_primitives::NODE_VERSION; -use clap::Parser; +use clap::{ArgAction, Parser}; use std::path::PathBuf; #[allow(missing_docs)] @@ -148,9 +148,9 @@ pub struct RunCmd { /// Enable approval-voting message processing in parallel. /// - ///**Dangerous!** This is an experimental feature and should not be used in production, unless - /// explicitly advised to. - #[arg(long)] + /// This is a flag used for gradually enabling approval-voting-parallel in production, + /// should not be used unless explicitly advised to. It will be removed in the future. + #[arg(long, default_value = "true", action=ArgAction::Set)] pub enable_approval_voting_parallel: bool, } diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs index 820cce8d083a63903d7887247990545bce114315..ce17ae5f51b9060b030ce9ffa6203f4c1368e29f 100644 --- a/polkadot/node/service/src/lib.rs +++ b/polkadot/node/service/src/lib.rs @@ -759,13 +759,6 @@ pub fn new_full< Some(backoff) }; - // Running approval voting in parallel is enabled by default on all networks except Polkadot - // unless explicitly enabled by the commandline option. - // This is meant to be temporary until we have enough confidence in the new system to enable it - // by default on all networks. - let enable_approval_voting_parallel = - !config.chain_spec.is_polkadot() || enable_approval_voting_parallel; - let disable_grandpa = config.disable_grandpa; let name = config.network.node_name.clone(); diff --git a/prdoc/pr_7504.prdoc b/prdoc/pr_7504.prdoc new file mode 100644 index 0000000000000000000000000000000000000000..3b3a64ffcdc1855c20f5b77a2c991360e0108436 --- /dev/null +++ b/prdoc/pr_7504.prdoc @@ -0,0 +1,11 @@ +title: Enable approval-voting-parallel by default on polkadot + +doc: + - audience: Node Dev + description: | + Enable approval-voting-parallel by default on polkadot +crates: + - name: polkadot-service + bump: patch + - name: polkadot-cli + bump: patch