remove solana-sdk from tpu-client-next (#4009)

anza-xyz · Dec 9, 2024 · 2705f5e · 2705f5e
1 parent 09ef712
commit 2705f5e
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/svm/examples/Cargo.lock b/svm/examples/Cargo.lock
diff --git a/tpu-client-next/Cargo.toml b/tpu-client-next/Cargo.toml
@@ -14,12 +14,15 @@ log = { workspace = true }
 lru = { workspace = true }
 quinn = { workspace = true }
 rustls = { workspace = true }
+solana-clock = { workspace = true }
 solana-connection-cache = { workspace = true }
+solana-keypair = { workspace = true }
 solana-logger = { workspace = true }
 solana-measure = { workspace = true }
+solana-quic-definitions = { workspace = true }
 solana-rpc-client = { workspace = true }
-solana-sdk = { workspace = true }
 solana-streamer = { workspace = true }
+solana-time-utils = { workspace = true }
 solana-tls-utils = { workspace = true }
 solana-tpu-client = { workspace = true }
 thiserror = { workspace = true }
@@ -30,6 +33,9 @@ tokio-util = { workspace = true }
 crossbeam-channel = { workspace = true }
 futures = { workspace = true }
 solana-cli-config = { workspace = true }
+solana-commitment-config = { workspace = true }
+solana-pubkey = { workspace = true }
+solana-signer = { workspace = true }
 solana-streamer = { workspace = true, features = ["dev-context-only-utils"] }
 
 [package.metadata.docs.rs]

diff --git a/tpu-client-next/src/connection_worker.rs b/tpu-client-next/src/connection_worker.rs
@@ -9,11 +9,9 @@ use {
     },
     log::*,
     quinn::{ConnectError, Connection, Endpoint},
+    solana_clock::{DEFAULT_MS_PER_SLOT, MAX_PROCESSING_AGE, NUM_CONSECUTIVE_LEADER_SLOTS},
     solana_measure::measure::Measure,
-    solana_sdk::{
-        clock::{DEFAULT_MS_PER_SLOT, MAX_PROCESSING_AGE, NUM_CONSECUTIVE_LEADER_SLOTS},
-        timing::timestamp,
-    },
+    solana_time_utils::timestamp,
     std::{
         net::SocketAddr,
         sync::{atomic::Ordering, Arc},

diff --git a/tpu-client-next/src/connection_workers_scheduler.rs b/tpu-client-next/src/connection_workers_scheduler.rs
@@ -14,7 +14,7 @@ use {
     },
     log::*,
     quinn::Endpoint,
-    solana_sdk::signature::Keypair,
+    solana_keypair::Keypair,
     std::{net::SocketAddr, sync::Arc},
     thiserror::Error,
     tokio::sync::mpsc,

diff --git a/tpu-client-next/src/leader_updater.rs b/tpu-client-next/src/leader_updater.rs
@@ -11,9 +11,9 @@
 use {
     async_trait::async_trait,
     log::*,
+    solana_clock::NUM_CONSECUTIVE_LEADER_SLOTS,
     solana_connection_cache::connection_cache::Protocol,
     solana_rpc_client::nonblocking::rpc_client::RpcClient,
-    solana_sdk::clock::NUM_CONSECUTIVE_LEADER_SLOTS,
     solana_tpu_client::nonblocking::tpu_client::LeaderTpuService,
     std::{
         fmt,

diff --git a/tpu-client-next/src/quic_networking.rs b/tpu-client-next/src/quic_networking.rs
@@ -5,7 +5,7 @@ use {
         crypto::rustls::QuicClientConfig, ClientConfig, Connection, Endpoint, IdleTimeout,
         TransportConfig,
     },
-    solana_sdk::quic::{QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT},
+    solana_quic_definitions::{QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT},
     solana_streamer::nonblocking::quic::ALPN_TPU_PROTOCOL_ID,
     solana_tls_utils::SkipServerVerification,
     std::{net::SocketAddr, sync::Arc},

diff --git a/tpu-client-next/src/transaction_batch.rs b/tpu-client-next/src/transaction_batch.rs
@@ -1,6 +1,6 @@
 //! This module holds [`TransactionBatch`] structure.
 
-use solana_sdk::timing::timestamp;
+use solana_time_utils::timestamp;
 
 /// Batch of generated transactions timestamp is used to discard batches which
 /// are too old to have valid blockhash.

diff --git a/tpu-client-next/tests/connection_workers_scheduler_test.rs b/tpu-client-next/tests/connection_workers_scheduler_test.rs
@@ -2,12 +2,11 @@ use {
     crossbeam_channel::Receiver as CrossbeamReceiver,
     futures::future::BoxFuture,
     solana_cli_config::ConfigInput,
+    solana_commitment_config::CommitmentConfig,
+    solana_keypair::Keypair,
+    solana_pubkey::Pubkey,
     solana_rpc_client::nonblocking::rpc_client::RpcClient,
-    solana_sdk::{
-        commitment_config::CommitmentConfig,
-        pubkey::Pubkey,
-        signer::{keypair::Keypair, Signer},
-    },
+    solana_signer::Signer,
     solana_streamer::{
         nonblocking::testing_utilities::{
             make_client_endpoint, setup_quic_server, SpawnTestServerResult, TestServerConfig,