remove solana-sdk from solana-connection-cache (#3436)

* remove solana-sdk from solana-connection-cache * post-rebase fix
anza-xyz · Nov 7, 2024 · c199872 · c199872
1 parent 966c3c8
commit c199872
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/connection-cache/Cargo.toml b/connection-cache/Cargo.toml
@@ -19,9 +19,11 @@ indicatif = { workspace = true, optional = true }
 log = { workspace = true }
 rand = { workspace = true }
 rayon = { workspace = true }
+solana-keypair = { workspace = true }
 solana-measure = { workspace = true }
 solana-metrics = { workspace = true }
-solana-sdk = { workspace = true }
+solana-time-utils = { workspace = true }
+solana-transaction-error = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 

diff --git a/connection-cache/src/client_connection.rs b/connection-cache/src/client_connection.rs
@@ -1,6 +1,6 @@
 use {
     solana_metrics::MovingStat,
-    solana_sdk::transport::Result as TransportResult,
+    solana_transaction_error::TransportResult,
     std::{net::SocketAddr, sync::atomic::AtomicU64},
 };
 

diff --git a/connection-cache/src/connection_cache.rs b/connection-cache/src/connection_cache.rs
@@ -8,8 +8,9 @@ use {
     indexmap::map::IndexMap,
     log::*,
     rand::{thread_rng, Rng},
+    solana_keypair::Keypair,
     solana_measure::measure::Measure,
-    solana_sdk::{signature::Keypair, timing::AtomicInterval},
+    solana_time_utils::AtomicInterval,
     std::{
         net::SocketAddr,
         sync::{atomic::Ordering, Arc, RwLock},
@@ -513,7 +514,7 @@ mod tests {
         async_trait::async_trait,
         rand::{Rng, SeedableRng},
         rand_chacha::ChaChaRng,
-        solana_sdk::transport::Result as TransportResult,
+        solana_transaction_error::TransportResult,
         std::{
             net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
             sync::Arc,

diff --git a/connection-cache/src/nonblocking/client_connection.rs b/connection-cache/src/nonblocking/client_connection.rs
@@ -1,9 +1,6 @@
 //! Trait defining async send functions, to be used for UDP or QUIC sending
 
-use {
-    async_trait::async_trait, solana_sdk::transport::Result as TransportResult,
-    std::net::SocketAddr,
-};
+use {async_trait::async_trait, solana_transaction_error::TransportResult, std::net::SocketAddr};
 
 #[async_trait]
 pub trait ClientConnection {

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock