Revert "Extract client code in send_transaction_service into a new st…

…ructure (#3423)" This reverts commit 144925e.
anza-xyz · Jan 3, 2025 · 6cb14fd · 6cb14fd
1 parent 97f1c5f
commit 6cb14fd
Show file tree

Hide file tree

Showing 11 changed files with 466 additions and 498 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/banks-server/src/banks_server.rs b/banks-server/src/banks_server.rs
@@ -459,7 +459,7 @@ pub async fn start_tcp_server(
                 &bank_forks,
                 None,
                 receiver,
-                connection_cache.clone(),
+                &connection_cache,
                 5_000,
                 0,
                 exit.clone(),

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
@@ -463,7 +463,7 @@ impl JsonRpcRequestProcessor {
             &bank_forks,
             None,
             transaction_receiver,
-            connection_cache,
+            &connection_cache,
             1000,
             1,
             exit.clone(),
@@ -6698,7 +6698,7 @@ pub mod tests {
             &bank_forks,
             None,
             receiver,
-            connection_cache,
+            &connection_cache,
             1000,
             1,
             exit,
@@ -6980,7 +6980,7 @@ pub mod tests {
             &bank_forks,
             None,
             receiver,
-            connection_cache,
+            &connection_cache,
             1000,
             1,
             exit,

diff --git a/rpc/src/rpc_service.rs b/rpc/src/rpc_service.rs
@@ -467,7 +467,7 @@ impl JsonRpcService {
             &bank_forks,
             leader_info,
             receiver,
-            connection_cache,
+            &connection_cache,
             send_transaction_service_config,
             exit,
         ));

diff --git a/send-transaction-service/Cargo.toml b/send-transaction-service/Cargo.toml
@@ -11,7 +11,6 @@ edition = { workspace = true }
 
 [dependencies]
 crossbeam-channel = { workspace = true }
-itertools = { workspace = true }
 log = { workspace = true }
 solana-client = { workspace = true }
 solana-connection-cache = { workspace = true }

diff --git a/send-transaction-service/src/lib.rs b/send-transaction-service/src/lib.rs
@@ -1,8 +1,6 @@
 #![allow(clippy::arithmetic_side_effects)]
 pub mod send_transaction_service;
-pub mod send_transaction_service_stats;
 pub mod tpu_info;
-pub mod transaction_client;
 
 #[macro_use]
 extern crate solana_metrics;