Extract client code in send_transaction_service into a new structure (s…

…olana-labs#3423) In order to be able to use new client code in the `SendTransactionService`, I need to wrap network-related code with the new structure ConnectionCacheClient. To to that I also had to move some auxiliary code into separate files.
brooksprumo · Nov 5, 2024 · 144925e · 144925e
1 parent c3bc1bf
commit 144925e
Show file tree

Hide file tree

Showing 10 changed files with 497 additions and 466 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,
+                connection_cache.clone(),
                 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
@@ -378,7 +378,7 @@ impl JsonRpcRequestProcessor {
             &bank_forks,
             None,
             receiver,
-            &connection_cache,
+            connection_cache,
             1000,
             1,
             exit.clone(),
@@ -6487,7 +6487,7 @@ pub mod tests {
             &bank_forks,
             None,
             receiver,
-            &connection_cache,
+            connection_cache,
             1000,
             1,
             exit,
@@ -6761,7 +6761,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
@@ -479,7 +479,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,6 +11,7 @@ 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,6 +1,8 @@
 #![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;