remove solana-sdk from solana-quic-client (#3441)

* remove solana-sdk from solana-quic-client * sort deps
anza-xyz · Nov 14, 2024 · 092d609 · 092d609
1 parent 22e10c7
commit 092d609
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/quic-client/Cargo.toml b/quic-client/Cargo.toml
@@ -20,16 +20,21 @@ quinn = { workspace = true }
 quinn-proto = { workspace = true }
 rustls = { workspace = true }
 solana-connection-cache = { workspace = true }
+solana-keypair = { workspace = true }
 solana-measure = { workspace = true }
 solana-metrics = { workspace = true }
 solana-net-utils = { workspace = true }
+solana-pubkey = { workspace = true, default-features = false }
+solana-quic-definitions = { workspace = true }
 solana-rpc-client-api = { workspace = true }
-solana-sdk = { workspace = true }
+solana-signer = { workspace = true }
 solana-streamer = { workspace = true }
+solana-transaction-error = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 
 [dev-dependencies]
 crossbeam-channel = { workspace = true }
 solana-logger = { workspace = true }
 solana-perf = { workspace = true }
+solana-sdk = { workspace = true }
diff --git a/quic-client/src/lib.rs b/quic-client/src/lib.rs
@@ -22,10 +22,9 @@ use {
         },
         connection_cache_stats::ConnectionCacheStats,
     },
-    solana_sdk::{
-        pubkey::Pubkey,
-        signature::{Keypair, Signer},
-    },
+    solana_keypair::Keypair,
+    solana_pubkey::Pubkey,
+    solana_signer::Signer,
     solana_streamer::{streamer::StakedNodes, tls_certificates::new_dummy_x509_certificate},
     std::{
         net::{IpAddr, SocketAddr},

diff --git a/quic-client/src/nonblocking/quic_client.rs b/quic-client/src/nonblocking/quic_client.rs
@@ -15,17 +15,17 @@ use {
         client_connection::ClientStats, connection_cache_stats::ConnectionCacheStats,
         nonblocking::client_connection::ClientConnection,
     },
+    solana_keypair::Keypair,
     solana_measure::measure::Measure,
     solana_net_utils::VALIDATOR_PORT_RANGE,
-    solana_rpc_client_api::client_error::ErrorKind as ClientErrorKind,
-    solana_sdk::{
-        quic::{QUIC_CONNECTION_HANDSHAKE_TIMEOUT, QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT},
-        signature::Keypair,
-        transport::Result as TransportResult,
+    solana_quic_definitions::{
+        QUIC_CONNECTION_HANDSHAKE_TIMEOUT, QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT,
     },
+    solana_rpc_client_api::client_error::ErrorKind as ClientErrorKind,
     solana_streamer::{
         nonblocking::quic::ALPN_TPU_PROTOCOL_ID, tls_certificates::new_dummy_x509_certificate,
     },
+    solana_transaction_error::TransportResult,
     std::{
         net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket},
         sync::{atomic::Ordering, Arc},

diff --git a/quic-client/src/quic_client.rs b/quic-client/src/quic_client.rs
@@ -12,7 +12,7 @@ use {
         connection_cache_stats::ConnectionCacheStats,
         nonblocking::client_connection::ClientConnection as NonblockingClientConnection,
     },
-    solana_sdk::transport::{Result as TransportResult, TransportError},
+    solana_transaction_error::{TransportError, TransportResult},
     std::{
         net::SocketAddr,
         sync::{atomic::Ordering, Arc, Condvar, Mutex, MutexGuard},