From 47d860063eb7c8cf7db28623261a998032e73ef4 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Thu, 26 Sep 2024 16:43:09 +0100
Subject: [PATCH 01/14] expose client module from sc-service

---
 substrate/client/service/src/lib.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/substrate/client/service/src/lib.rs b/substrate/client/service/src/lib.rs
index b6acdb8ed002a..d1ab555549b33 100644
--- a/substrate/client/service/src/lib.rs
+++ b/substrate/client/service/src/lib.rs
@@ -27,10 +27,7 @@ pub mod config;
 pub mod error;
 
 mod builder;
-#[cfg(feature = "test-helpers")]
 pub mod client;
-#[cfg(not(feature = "test-helpers"))]
-mod client;
 mod metrics;
 mod task_manager;
 

From 3075c04949bfa0d7501c4186d1d6cdcdde9abec8 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Fri, 27 Sep 2024 09:23:31 +0100
Subject: [PATCH 02/14] make WasmOverride and WasmSubstitutes public

---
 substrate/client/service/src/client/mod.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/substrate/client/service/src/client/mod.rs b/substrate/client/service/src/client/mod.rs
index ec77a92f162f0..533ad53e819c4 100644
--- a/substrate/client/service/src/client/mod.rs
+++ b/substrate/client/service/src/client/mod.rs
@@ -52,6 +52,8 @@ mod notification_pinning;
 mod wasm_override;
 mod wasm_substitutes;
 
+pub use wasm_override::WasmOverride;
+pub use wasm_substitutes::WasmSubstitutes;
 pub use call_executor::LocalCallExecutor;
 pub use client::{Client, ClientConfig};
 pub(crate) use code_provider::CodeProvider;

From 59a4b8544d05ee5f2c7423012e117a12c3dfd4c4 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Fri, 27 Sep 2024 09:45:13 +0100
Subject: [PATCH 03/14] make CodeProvider public

---
 substrate/client/service/src/client/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substrate/client/service/src/client/mod.rs b/substrate/client/service/src/client/mod.rs
index 533ad53e819c4..08dc048cf5684 100644
--- a/substrate/client/service/src/client/mod.rs
+++ b/substrate/client/service/src/client/mod.rs
@@ -52,6 +52,7 @@ mod notification_pinning;
 mod wasm_override;
 mod wasm_substitutes;
 
+pub use code_provider::CodeProvider;
 pub use wasm_override::WasmOverride;
 pub use wasm_substitutes::WasmSubstitutes;
 pub use call_executor::LocalCallExecutor;

From 6ea3881ce076ba321bb32e5cec3db3b7eb3eb277 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Tue, 1 Oct 2024 10:35:59 +0100
Subject: [PATCH 04/14] remove redundant export

---
 substrate/client/service/src/client/mod.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/substrate/client/service/src/client/mod.rs b/substrate/client/service/src/client/mod.rs
index 08dc048cf5684..2b4a7c41a464d 100644
--- a/substrate/client/service/src/client/mod.rs
+++ b/substrate/client/service/src/client/mod.rs
@@ -52,12 +52,11 @@ mod notification_pinning;
 mod wasm_override;
 mod wasm_substitutes;
 
-pub use code_provider::CodeProvider;
 pub use wasm_override::WasmOverride;
 pub use wasm_substitutes::WasmSubstitutes;
 pub use call_executor::LocalCallExecutor;
 pub use client::{Client, ClientConfig};
-pub(crate) use code_provider::CodeProvider;
+pub use code_provider::CodeProvider;
 
 #[cfg(feature = "test-helpers")]
 pub use self::client::{new_in_mem, new_with_backend};

From 11623bb412444745f503169ed911f6b7bd37b43c Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Mon, 18 Nov 2024 22:02:22 +0000
Subject: [PATCH 05/14] don't make WasmOverride, WasmSubstitutes and
 CodeProvider public

---
 substrate/client/service/src/client/mod.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/substrate/client/service/src/client/mod.rs b/substrate/client/service/src/client/mod.rs
index 2b4a7c41a464d..7145b82259aad 100644
--- a/substrate/client/service/src/client/mod.rs
+++ b/substrate/client/service/src/client/mod.rs
@@ -52,11 +52,8 @@ mod notification_pinning;
 mod wasm_override;
 mod wasm_substitutes;
 
-pub use wasm_override::WasmOverride;
-pub use wasm_substitutes::WasmSubstitutes;
 pub use call_executor::LocalCallExecutor;
 pub use client::{Client, ClientConfig};
-pub use code_provider::CodeProvider;
 
 #[cfg(feature = "test-helpers")]
 pub use self::client::{new_in_mem, new_with_backend};

From 623623ed545443774289a40f11e8cbb11013e484 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Mon, 18 Nov 2024 22:03:38 +0000
Subject: [PATCH 06/14] revert changes to CodeProvider

---
 substrate/client/service/src/client/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/substrate/client/service/src/client/mod.rs b/substrate/client/service/src/client/mod.rs
index 7145b82259aad..ec77a92f162f0 100644
--- a/substrate/client/service/src/client/mod.rs
+++ b/substrate/client/service/src/client/mod.rs
@@ -54,6 +54,7 @@ mod wasm_substitutes;
 
 pub use call_executor::LocalCallExecutor;
 pub use client::{Client, ClientConfig};
+pub(crate) use code_provider::CodeProvider;
 
 #[cfg(feature = "test-helpers")]
 pub use self::client::{new_in_mem, new_with_backend};

From 56335bfc0879713496fbf097b11a2990e0bbe22c Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Mon, 18 Nov 2024 23:15:52 +0000
Subject: [PATCH 07/14] remove 'test-helpers' feature from sc-service

---
 substrate/bin/node/testing/Cargo.toml         |  2 +-
 substrate/client/network/test/Cargo.toml      |  2 +-
 substrate/client/rpc-spec-v2/Cargo.toml       |  2 +-
 .../src/chain_head/subscription/inner.rs      |  4 +-
 .../rpc-spec-v2/src/chain_head/tests.rs       |  4 +-
 substrate/client/service/Cargo.toml           |  2 -
 substrate/client/service/src/client/client.rs | 40 +------------------
 substrate/client/service/src/client/mod.rs    |  3 +-
 substrate/client/service/test/Cargo.toml      |  2 +-
 substrate/test-utils/client/Cargo.toml        |  4 +-
 substrate/test-utils/runtime/Cargo.toml       |  2 +-
 11 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/substrate/bin/node/testing/Cargo.toml b/substrate/bin/node/testing/Cargo.toml
index 16112386ad7cb..1972c03a368b5 100644
--- a/substrate/bin/node/testing/Cargo.toml
+++ b/substrate/bin/node/testing/Cargo.toml
@@ -37,7 +37,7 @@ sc-client-api = { workspace = true, default-features = true }
 sc-client-db = { features = ["rocksdb"], workspace = true, default-features = true }
 sc-consensus = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
-sc-service = { features = ["rocksdb", "test-helpers"], workspace = true, default-features = true }
+sc-service = { features = ["rocksdb"], workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-block-builder = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
diff --git a/substrate/client/network/test/Cargo.toml b/substrate/client/network/test/Cargo.toml
index ebece1762f294..6340d1dfb2f42 100644
--- a/substrate/client/network/test/Cargo.toml
+++ b/substrate/client/network/test/Cargo.toml
@@ -33,7 +33,7 @@ sc-network-types = { workspace = true, default-features = true }
 sc-utils = { workspace = true, default-features = true }
 sc-network-light = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-service = { features = ["test-helpers"], workspace = true }
+sc-service = { workspace = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
diff --git a/substrate/client/rpc-spec-v2/Cargo.toml b/substrate/client/rpc-spec-v2/Cargo.toml
index 58dd8b830bebf..98ce51dcc45a7 100644
--- a/substrate/client/rpc-spec-v2/Cargo.toml
+++ b/substrate/client/rpc-spec-v2/Cargo.toml
@@ -54,7 +54,7 @@ sp-consensus = { workspace = true, default-features = true }
 sp-externalities = { workspace = true, default-features = true }
 sp-maybe-compressed-blob = { workspace = true, default-features = true }
 sc-block-builder = { workspace = true, default-features = true }
-sc-service = { features = ["test-helpers"], workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sc-rpc = { workspace = true, default-features = true, features = ["test-helpers"] }
 assert_matches = { workspace = true }
 pretty_assertions = { workspace = true }
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs b/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
index 95a7c7fe18320..73fe0d2d99580 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
@@ -811,13 +811,13 @@ mod tests {
 		)
 		.unwrap();
 		let client = Arc::new(
-			new_in_mem::<_, Block, _, RuntimeApi>(
+			new_with_backend::<_, _, Block, _, RuntimeApi>(
 				backend.clone(),
 				executor,
 				genesis_block_builder,
+				Box::new(TaskExecutor::new()),
 				None,
 				None,
-				Box::new(TaskExecutor::new()),
 				client_config,
 			)
 			.unwrap(),
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
index c505566d887db..5b94aaef35ba0 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
@@ -2547,13 +2547,13 @@ async fn pin_block_references() {
 	.unwrap();
 
 	let client = Arc::new(
-		new_in_mem::<_, Block, _, RuntimeApi>(
+		new_with_backend::<_, _, Block, _, RuntimeApi>(
 			backend.clone(),
 			executor,
 			genesis_block_builder,
+			Box::new(TokioTestExecutor::default()),
 			None,
 			None,
-			Box::new(TokioTestExecutor::default()),
 			client_config,
 		)
 		.unwrap(),
diff --git a/substrate/client/service/Cargo.toml b/substrate/client/service/Cargo.toml
index f2fc65ef24399..3981395d9768e 100644
--- a/substrate/client/service/Cargo.toml
+++ b/substrate/client/service/Cargo.toml
@@ -20,8 +20,6 @@ default = ["rocksdb"]
 # The RocksDB feature activates the RocksDB database backend. If it is not activated, and you pass
 # a path to a database, an error will be produced at runtime.
 rocksdb = ["sc-client-db/rocksdb"]
-# exposes the client type
-test-helpers = []
 runtime-benchmarks = [
 	"sc-client-db/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
diff --git a/substrate/client/service/src/client/client.rs b/substrate/client/service/src/client/client.rs
index ce5b92551bf2e..eddbb9260c053 100644
--- a/substrate/client/service/src/client/client.rs
+++ b/substrate/client/service/src/client/client.rs
@@ -85,10 +85,8 @@ use std::{
 	sync::Arc,
 };
 
-#[cfg(feature = "test-helpers")]
-use {
-	super::call_executor::LocalCallExecutor, sc_client_api::in_mem, sp_core::traits::CodeExecutor,
-};
+use super::call_executor::LocalCallExecutor;
+use sp_core::traits::CodeExecutor;
 
 type NotificationSinks<T> = Mutex<Vec<TracingUnboundedSender<T>>>;
 
@@ -152,39 +150,6 @@ enum PrepareStorageChangesResult<Block: BlockT> {
 	Discard(ImportResult),
 	Import(Option<sc_consensus::StorageChanges<Block>>),
 }
-
-/// Create an instance of in-memory client.
-#[cfg(feature = "test-helpers")]
-pub fn new_in_mem<E, Block, G, RA>(
-	backend: Arc<in_mem::Backend<Block>>,
-	executor: E,
-	genesis_block_builder: G,
-	prometheus_registry: Option<Registry>,
-	telemetry: Option<TelemetryHandle>,
-	spawn_handle: Box<dyn SpawnNamed>,
-	config: ClientConfig<Block>,
-) -> sp_blockchain::Result<
-	Client<in_mem::Backend<Block>, LocalCallExecutor<Block, in_mem::Backend<Block>, E>, Block, RA>,
->
-where
-	E: CodeExecutor + sc_executor::RuntimeVersionOf,
-	Block: BlockT,
-	G: BuildGenesisBlock<
-			Block,
-			BlockImportOperation = <in_mem::Backend<Block> as backend::Backend<Block>>::BlockImportOperation,
-		>,
-{
-	new_with_backend(
-		backend,
-		executor,
-		genesis_block_builder,
-		spawn_handle,
-		prometheus_registry,
-		telemetry,
-		config,
-	)
-}
-
 /// Client configuration items.
 #[derive(Debug, Clone)]
 pub struct ClientConfig<Block: BlockT> {
@@ -218,7 +183,6 @@ impl<Block: BlockT> Default for ClientConfig<Block> {
 
 /// Create a client with the explicitly provided backend.
 /// This is useful for testing backend implementations.
-#[cfg(feature = "test-helpers")]
 pub fn new_with_backend<B, E, Block, G, RA>(
 	backend: Arc<B>,
 	executor: E,
diff --git a/substrate/client/service/src/client/mod.rs b/substrate/client/service/src/client/mod.rs
index ec77a92f162f0..3020b3d296f4b 100644
--- a/substrate/client/service/src/client/mod.rs
+++ b/substrate/client/service/src/client/mod.rs
@@ -56,5 +56,4 @@ pub use call_executor::LocalCallExecutor;
 pub use client::{Client, ClientConfig};
 pub(crate) use code_provider::CodeProvider;
 
-#[cfg(feature = "test-helpers")]
-pub use self::client::{new_in_mem, new_with_backend};
+pub use self::client::new_with_backend;
diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
index 0edfc5b193144..1f546840cf2de 100644
--- a/substrate/client/service/test/Cargo.toml
+++ b/substrate/client/service/test/Cargo.toml
@@ -31,7 +31,7 @@ sc-consensus = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-service = { features = ["test-helpers"], workspace = true, default-features = true }
+sc-service = {workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }
diff --git a/substrate/test-utils/client/Cargo.toml b/substrate/test-utils/client/Cargo.toml
index ebd1eab5980da..a67c91fc5f794 100644
--- a/substrate/test-utils/client/Cargo.toml
+++ b/substrate/test-utils/client/Cargo.toml
@@ -29,9 +29,7 @@ sc-client-db = { features = [
 sc-consensus = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-offchain = { workspace = true, default-features = true }
-sc-service = { features = [
-	"test-helpers",
-], workspace = true }
+sc-service = { workspace = true }
 sp-blockchain = { workspace = true, default-features = true }
 sp-consensus = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
index 1c82c73072bca..96a8880528769 100644
--- a/substrate/test-utils/runtime/Cargo.toml
+++ b/substrate/test-utils/runtime/Cargo.toml
@@ -45,7 +45,7 @@ sp-consensus-grandpa = { features = ["serde"], workspace = true }
 sp-trie = { workspace = true }
 sp-transaction-pool = { workspace = true }
 trie-db = { workspace = true }
-sc-service = { features = ["test-helpers"], optional = true, workspace = true }
+sc-service = { optional = true, workspace = true }
 sp-state-machine = { workspace = true }
 sp-externalities = { workspace = true }
 

From 126644877f773fbf711797ddda6246016b8fd5cb Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Tue, 19 Nov 2024 11:55:21 +0000
Subject: [PATCH 08/14] apply suggestion

---
 substrate/client/service/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/client/service/src/lib.rs b/substrate/client/service/src/lib.rs
index 415da439e7b5a..2d751d3b0cb63 100644
--- a/substrate/client/service/src/lib.rs
+++ b/substrate/client/service/src/lib.rs
@@ -23,11 +23,11 @@
 #![recursion_limit = "1024"]
 
 pub mod chain_ops;
+pub mod client;
 pub mod config;
 pub mod error;
 
 mod builder;
-pub mod client;
 mod metrics;
 mod task_manager;
 

From 4197d43583644fc28c6cc6a94dd4d02df99efcb2 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Tue, 19 Nov 2024 11:56:11 +0000
Subject: [PATCH 09/14] doc: add prdoc

---
 prdoc/pr_5855.prdoc | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 prdoc/pr_5855.prdoc

diff --git a/prdoc/pr_5855.prdoc b/prdoc/pr_5855.prdoc
new file mode 100644
index 0000000000000..a10555000fa8d
--- /dev/null
+++ b/prdoc/pr_5855.prdoc
@@ -0,0 +1,10 @@
+title: Remove feature `test-helpers` from sc-service
+doc:
+- audience: Node Dev
+  description: |-
+    Removes feature `test-helpers` from sc-service.
+crates:
+- name: sc-service
+  bump: major
+- name: sc-rpc-spec-v2
+  bump: major

From 35ccdfb0bee3e0b0928467e6a41dc068501eac78 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Tue, 19 Nov 2024 12:35:36 +0000
Subject: [PATCH 10/14] fix test

---
 .../client/rpc-spec-v2/src/chain_head/subscription/inner.rs     | 2 +-
 substrate/client/rpc-spec-v2/src/chain_head/tests.rs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs b/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
index 73fe0d2d99580..3e1bd23776d31 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/subscription/inner.rs
@@ -784,7 +784,7 @@ mod tests {
 	use super::*;
 	use jsonrpsee::ConnectionId;
 	use sc_block_builder::BlockBuilderBuilder;
-	use sc_service::client::new_in_mem;
+	use sc_service::client::new_with_backend;
 	use sp_consensus::BlockOrigin;
 	use sp_core::{testing::TaskExecutor, H256};
 	use substrate_test_runtime_client::{
diff --git a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
index 5b94aaef35ba0..21e8365622a1b 100644
--- a/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
+++ b/substrate/client/rpc-spec-v2/src/chain_head/tests.rs
@@ -34,7 +34,7 @@ use jsonrpsee::{
 use sc_block_builder::BlockBuilderBuilder;
 use sc_client_api::ChildInfo;
 use sc_rpc::testing::TokioTestExecutor;
-use sc_service::client::new_in_mem;
+use sc_service::client::new_with_backend;
 use sp_blockchain::HeaderBackend;
 use sp_consensus::BlockOrigin;
 use sp_core::{

From d2b29270d1eefaabfc98423f0964d7e7ea5bac0e Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Tue, 19 Nov 2024 12:37:22 +0000
Subject: [PATCH 11/14] fix import

---
 substrate/client/service/test/src/client/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/substrate/client/service/test/src/client/mod.rs b/substrate/client/service/test/src/client/mod.rs
index 55bbfcdd85948..3b68d852d32ea 100644
--- a/substrate/client/service/test/src/client/mod.rs
+++ b/substrate/client/service/test/src/client/mod.rs
@@ -29,7 +29,7 @@ use sc_consensus::{
 	BlockCheckParams, BlockImport, BlockImportParams, ForkChoiceStrategy, ImportResult,
 };
 use sc_executor::WasmExecutor;
-use sc_service::client::{new_in_mem, Client, LocalCallExecutor};
+use sc_service::client::{new_with_backend, Client, LocalCallExecutor};
 use sp_api::ProvideRuntimeApi;
 use sp_consensus::{BlockOrigin, Error as ConsensusError, SelectChain};
 use sp_core::{testing::TaskExecutor, traits::CallContext, H256};
@@ -2087,7 +2087,7 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 	// NOTE: we need to build the client here instead of using the client
 	// provided by test_runtime_client otherwise we can't access the private
 	// `import_notification_sinks` and `finality_notification_sinks` fields.
-	let mut client = new_in_mem::<_, Block, _, RuntimeApi>(
+	let mut client = new_with_backend::<_, _, Block, _, RuntimeApi>(
 		backend,
 		executor,
 		genesis_block_builder,

From 1f655cf4be1756aa9c0d9700e4313378dd8313f7 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Tue, 19 Nov 2024 12:48:56 +0000
Subject: [PATCH 12/14] fix new_with_backend usage

---
 substrate/client/service/test/src/client/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/client/service/test/src/client/mod.rs b/substrate/client/service/test/src/client/mod.rs
index 3b68d852d32ea..ead90c4c65d8f 100644
--- a/substrate/client/service/test/src/client/mod.rs
+++ b/substrate/client/service/test/src/client/mod.rs
@@ -2091,9 +2091,9 @@ fn cleans_up_closed_notification_sinks_on_block_import() {
 		backend,
 		executor,
 		genesis_block_builder,
+		Box::new(TaskExecutor::new()),
 		None,
 		None,
-		Box::new(TaskExecutor::new()),
 		client_config,
 	)
 	.unwrap();

From 1aec906233c68e763c2c8aa4a1ce320023ac3016 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Tue, 19 Nov 2024 13:30:05 +0000
Subject: [PATCH 13/14] fix toml file format

---
 substrate/client/service/test/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/substrate/client/service/test/Cargo.toml b/substrate/client/service/test/Cargo.toml
index 1f546840cf2de..632b98104f6bf 100644
--- a/substrate/client/service/test/Cargo.toml
+++ b/substrate/client/service/test/Cargo.toml
@@ -31,7 +31,7 @@ sc-consensus = { workspace = true, default-features = true }
 sc-executor = { workspace = true, default-features = true }
 sc-network = { workspace = true, default-features = true }
 sc-network-sync = { workspace = true, default-features = true }
-sc-service = {workspace = true, default-features = true }
+sc-service = { workspace = true, default-features = true }
 sc-transaction-pool-api = { workspace = true, default-features = true }
 sp-api = { workspace = true, default-features = true }
 sp-blockchain = { workspace = true, default-features = true }

From 365a6e6fe366f97e0c3f58c5db6dd6d3356cc752 Mon Sep 17 00:00:00 2001
From: Rodrigo Quelhas <rodrigo_quelhas@outlook.pt>
Date: Mon, 25 Nov 2024 20:38:23 +0000
Subject: [PATCH 14/14] update prdoc

---
 prdoc/pr_5855.prdoc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/prdoc/pr_5855.prdoc b/prdoc/pr_5855.prdoc
index a10555000fa8d..7735cfee9f37d 100644
--- a/prdoc/pr_5855.prdoc
+++ b/prdoc/pr_5855.prdoc
@@ -1,10 +1,15 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
 title: Remove feature `test-helpers` from sc-service
+
 doc:
-- audience: Node Dev
-  description: |-
-    Removes feature `test-helpers` from sc-service.
+  - audience: Node Dev
+    description: |
+      Removes feature `test-helpers` from sc-service.
+
 crates:
-- name: sc-service
-  bump: major
-- name: sc-rpc-spec-v2
-  bump: major
+  - name: sc-service
+    bump: major
+  - name: sc-rpc-spec-v2
+    bump: major