From 59cddb9f2374fdce1fdfd1b9fa5b3321a5a1acb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 7 Feb 2022 17:05:53 +0100
Subject: [PATCH] Forward `enable_overseer_always` (#4858)
Cumulus actually uses the `build_full` function. I missed that.
---
polkadot/cli/src/command.rs | 1 +
polkadot/node/service/src/lib.rs | 17 +++++++++++++----
.../test-parachains/adder/collator/src/main.rs | 1 +
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index 10acbb1d7c0..0d6efefbb81 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -280,6 +280,7 @@ where
cli.run.beefy,
jaeger_agent,
None,
+ false,
overseer_gen,
)
.map(|full| full.task_manager)
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index 6c9d4b4510b..693513c3964 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -1257,6 +1257,14 @@ pub fn new_chain_ops(
Err(Error::NoRuntime)
}
+/// Build a full node.
+///
+/// The actual "flavor", aka if it will use `Polkadot`, `Rococo` or `Kusama` is determined based on
+/// [`IdentifyVariant`] using the chain spec.
+///
+/// `overseer_enable_anyways` always enables the overseer, based on the provided `OverseerGenerator`,
+/// regardless of the role the node has. The relay chain selection (longest or disputes-aware) is
+/// still determined based on the role of the node. Likewise for authority discovery.
#[cfg(feature = "full-node")]
pub fn build_full(
config: Configuration,
@@ -1265,6 +1273,7 @@ pub fn build_full(
enable_beefy: bool,
jaeger_agent: Option<std::net::SocketAddr>,
telemetry_worker_handle: Option<TelemetryWorkerHandle>,
+ overseer_enable_anyways: bool,
overseer_gen: impl OverseerGen,
) -> Result<NewFull<Client>, Error> {
#[cfg(feature = "rococo-native")]
@@ -1280,7 +1289,7 @@ pub fn build_full(
jaeger_agent,
telemetry_worker_handle,
None,
- false,
+ overseer_enable_anyways,
overseer_gen,
)
.map(|full| full.with_client(Client::Rococo))
@@ -1296,7 +1305,7 @@ pub fn build_full(
jaeger_agent,
telemetry_worker_handle,
None,
- false,
+ overseer_enable_anyways,
overseer_gen,
)
.map(|full| full.with_client(Client::Kusama))
@@ -1312,7 +1321,7 @@ pub fn build_full(
jaeger_agent,
telemetry_worker_handle,
None,
- false,
+ overseer_enable_anyways,
overseer_gen,
)
.map(|full| full.with_client(Client::Westend))
@@ -1328,7 +1337,7 @@ pub fn build_full(
jaeger_agent,
telemetry_worker_handle,
None,
- false,
+ overseer_enable_anyways,
overseer_gen,
)
.map(|full| full.with_client(Client::Polkadot))
diff --git a/polkadot/parachain/test-parachains/adder/collator/src/main.rs b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
index b1366abccb9..09f307e6fb7 100644
--- a/polkadot/parachain/test-parachains/adder/collator/src/main.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/src/main.rs
@@ -68,6 +68,7 @@ fn main() -> Result<()> {
true,
None,
None,
+ false,
polkadot_service::RealOverseerGen,
)
.map_err(|e| e.to_string())?;
--
GitLab