Merge pull request #140 from paritytech/1.13.3

Remove custom tx Pool from node configuration
paritytech · Jun 28, 2024 · 7d3498a · 7d3498a
2 parents a27c202 + cfb6bf5
commit 7d3498a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 139 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,6 @@ members = [
 	"primitives/xcm",
 	"runtime/mainnet",
 	"runtime/testnet",
-	"primitives/custom-pool",
 ]
 
 resolver = "2"
@@ -162,4 +161,3 @@ xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/par
 # Primitives
 account = { path = "./primitives/account", default-features = false }
 fp-self-contained = { path = "./primitives/self-contained", default-features = false }
-custom-pool = { path = "./primitives/custom-pool", default-features = false }
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -24,7 +24,6 @@ hex-literal = { workspace = true }
 testnet-runtime = { workspace = true }
 mainnet-runtime = { workspace = true }
 runtime-common = { workspace = true }
-custom-pool = { workspace = true }
 
 # Substrate
 frame-benchmarking = { workspace = true }

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -517,7 +517,7 @@ where
 	let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
 		task_manager.spawn_handle(),
 		client.clone(),
-		Arc::new(custom_pool::CustomPool::new(transaction_pool)),
+		transaction_pool,
 		prometheus_registry,
 		telemetry.clone(),
 	);

diff --git a/primitives/custom-pool/Cargo.toml b/primitives/custom-pool/Cargo.toml
diff --git a/primitives/custom-pool/src/lib.rs b/primitives/custom-pool/src/lib.rs