From 79d4568b64b21837d288bb3155a83d96c24ba0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dino=20Pa=C4=8Dandi?=
 <3002868+Dinonard@users.noreply.github.com>
Date: Thu, 3 Aug 2023 13:02:08 +0200
Subject: [PATCH] Remove txpool from non-tracing build (#993)

---
 Cargo.lock                 | 10 +++++-----
 bin/collator/Cargo.toml    |  2 +-
 bin/collator/src/rpc.rs    |  5 +----
 runtime/astar/Cargo.toml   |  2 +-
 runtime/local/Cargo.toml   |  2 +-
 runtime/shibuya/Cargo.toml |  2 +-
 runtime/shiden/Cargo.toml  |  2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 004fee0ca2..155d1231eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -404,7 +404,7 @@ dependencies = [
 
 [[package]]
 name = "astar-collator"
-version = "5.16.0"
+version = "5.16.1"
 dependencies = [
  "astar-primitives",
  "astar-runtime",
@@ -529,7 +529,7 @@ dependencies = [
 
 [[package]]
 name = "astar-runtime"
-version = "5.16.0"
+version = "5.16.1"
 dependencies = [
  "array-bytes 6.1.0",
  "astar-primitives",
@@ -5475,7 +5475,7 @@ checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
 [[package]]
 name = "local-runtime"
-version = "5.16.0"
+version = "5.16.1"
 dependencies = [
  "array-bytes 6.1.0",
  "astar-primitives",
@@ -12299,7 +12299,7 @@ dependencies = [
 
 [[package]]
 name = "shibuya-runtime"
-version = "5.16.0"
+version = "5.16.1"
 dependencies = [
  "array-bytes 6.1.0",
  "astar-primitives",
@@ -12407,7 +12407,7 @@ dependencies = [
 
 [[package]]
 name = "shiden-runtime"
-version = "5.16.0"
+version = "5.16.1"
 dependencies = [
  "array-bytes 6.1.0",
  "astar-primitives",
diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
index d459cc8ba4..b6c7a10b58 100644
--- a/bin/collator/Cargo.toml
+++ b/bin/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.16.0"
+version = "5.16.1"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"
diff --git a/bin/collator/src/rpc.rs b/bin/collator/src/rpc.rs
index 5516b1cc25..afa4f71f7d 100644
--- a/bin/collator/src/rpc.rs
+++ b/bin/collator/src/rpc.rs
@@ -20,8 +20,7 @@
 
 use fc_rpc::{
     Eth, EthApiServer, EthBlockDataCacheTask, EthFilter, EthFilterApiServer, EthPubSub,
-    EthPubSubApiServer, Net, NetApiServer, OverrideHandle, TxPool, TxPoolApiServer, Web3,
-    Web3ApiServer,
+    EthPubSubApiServer, Net, NetApiServer, OverrideHandle, TxPool, Web3, Web3ApiServer,
 };
 use fc_rpc_core::types::{FeeHistoryCache, FilterPool};
 use jsonrpsee::RpcModule;
@@ -332,7 +331,5 @@ where
         .into_rpc(),
     )?;
 
-    io.merge(tx_pool.into_rpc())?;
-
     Ok(io)
 }
diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
index 6a585846f4..07f8fec6f7 100644
--- a/runtime/astar/Cargo.toml
+++ b/runtime/astar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-runtime"
-version = "5.16.0"
+version = "5.16.1"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true
diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
index 5a5d1de6de..b49f360404 100644
--- a/runtime/local/Cargo.toml
+++ b/runtime/local/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "local-runtime"
-version = "5.16.0"
+version = "5.16.1"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true
diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
index ddb340dbec..f02da1a5fb 100644
--- a/runtime/shibuya/Cargo.toml
+++ b/runtime/shibuya/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shibuya-runtime"
-version = "5.16.0"
+version = "5.16.1"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true
diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
index 0268ef47e5..2d3c6e0e4c 100644
--- a/runtime/shiden/Cargo.toml
+++ b/runtime/shiden/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shiden-runtime"
-version = "5.16.0"
+version = "5.16.1"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true