[stable2407] backport #4937 (#5337)

Backport #4937 on the stable release
paritytech · Aug 13, 2024 · 131d56e · 131d56e
1 parent 4eb5f81
commit 131d56e
Show file tree

Hide file tree

Showing 14 changed files with 2,922 additions and 2,327 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/polkadot/node/core/prospective-parachains/Cargo.toml b/polkadot/node/core/prospective-parachains/Cargo.toml
@@ -13,14 +13,10 @@ workspace = true
 futures = { workspace = true }
 gum.workspace = true
 gum.default-features = true
-codec = { workspace = true, default-features = true }
 thiserror = { workspace = true }
 fatality = { workspace = true }
-bitvec = { workspace = true, default-features = true }
 polkadot-primitives.workspace = true
 polkadot-primitives.default-features = true
-polkadot-node-primitives.workspace = true
-polkadot-node-primitives.default-features = true
 polkadot-node-subsystem.workspace = true
 polkadot-node-subsystem.default-features = true
 polkadot-node-subsystem-util.workspace = true
@@ -29,11 +25,8 @@ polkadot-node-subsystem-util.default-features = true
 [dev-dependencies]
 assert_matches = { workspace = true }
 polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
-polkadot-node-subsystem-types = { default-features = true, path = "../../subsystem-types" }
 polkadot-primitives-test-helpers = { path = "../../../primitives/test-helpers" }
+sp-tracing = { workspace = true }
 sp-core = { default-features = true, path = "../../../../substrate/primitives/core" }
-sc-keystore = { default-features = true, path = "../../../../substrate/client/keystore" }
-sp-application-crypto = { default-features = true, path = "../../../../substrate/primitives/application-crypto" }
-sp-keyring = { default-features = true, path = "../../../../substrate/primitives/keyring" }
-sp-keystore = { default-features = true, path = "../../../../substrate/primitives/keystore" }
+rand = { workspace = true }
 rstest = { workspace = true }
diff --git a/polkadot/node/core/prospective-parachains/src/error.rs b/polkadot/node/core/prospective-parachains/src/error.rs
@@ -30,18 +30,6 @@ use fatality::Nested;
 #[allow(missing_docs)]
 #[fatality::fatality(splitable)]
 pub enum Error {
-	#[fatal]
-	#[error("SubsystemError::Context error: {0}")]
-	SubsystemContext(String),
-
-	#[fatal]
-	#[error("Spawning a task failed: {0}")]
-	SpawnFailed(SubsystemError),
-
-	#[fatal]
-	#[error("Participation worker receiver exhausted.")]
-	ParticipationWorkerReceiverExhausted,
-
 	#[fatal]
 	#[error("Receiving message from overseer failed: {0}")]
 	SubsystemReceive(#[source] SubsystemError),
@@ -55,9 +43,6 @@ pub enum Error {
 	#[error(transparent)]
 	ChainApi(#[from] ChainApiError),
 
-	#[error(transparent)]
-	Subsystem(SubsystemError),
-
 	#[error("Request to chain API subsystem dropped")]
 	ChainApiRequestCanceled(oneshot::Canceled),
 

diff --git a/polkadot/node/core/prospective-parachains/src/fragment_chain/mod.rs b/polkadot/node/core/prospective-parachains/src/fragment_chain/mod.rs