Skip to content

Commit 2705f5e

Browse files
authored
remove solana-sdk from tpu-client-next (#4009)
1 parent 09ef712 commit 2705f5e

File tree

10 files changed

+32
-17
lines changed

10 files changed

+32
-17
lines changed

Cargo.lock

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

programs/sbf/Cargo.lock

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

svm/examples/Cargo.lock

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tpu-client-next/Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ log = { workspace = true }
1414
lru = { workspace = true }
1515
quinn = { workspace = true }
1616
rustls = { workspace = true }
17+
solana-clock = { workspace = true }
1718
solana-connection-cache = { workspace = true }
19+
solana-keypair = { workspace = true }
1820
solana-logger = { workspace = true }
1921
solana-measure = { workspace = true }
22+
solana-quic-definitions = { workspace = true }
2023
solana-rpc-client = { workspace = true }
21-
solana-sdk = { workspace = true }
2224
solana-streamer = { workspace = true }
25+
solana-time-utils = { workspace = true }
2326
solana-tls-utils = { workspace = true }
2427
solana-tpu-client = { workspace = true }
2528
thiserror = { workspace = true }
@@ -30,6 +33,9 @@ tokio-util = { workspace = true }
3033
crossbeam-channel = { workspace = true }
3134
futures = { workspace = true }
3235
solana-cli-config = { workspace = true }
36+
solana-commitment-config = { workspace = true }
37+
solana-pubkey = { workspace = true }
38+
solana-signer = { workspace = true }
3339
solana-streamer = { workspace = true, features = ["dev-context-only-utils"] }
3440

3541
[package.metadata.docs.rs]

tpu-client-next/src/connection_worker.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ use {
99
},
1010
log::*,
1111
quinn::{ConnectError, Connection, Endpoint},
12+
solana_clock::{DEFAULT_MS_PER_SLOT, MAX_PROCESSING_AGE, NUM_CONSECUTIVE_LEADER_SLOTS},
1213
solana_measure::measure::Measure,
13-
solana_sdk::{
14-
clock::{DEFAULT_MS_PER_SLOT, MAX_PROCESSING_AGE, NUM_CONSECUTIVE_LEADER_SLOTS},
15-
timing::timestamp,
16-
},
14+
solana_time_utils::timestamp,
1715
std::{
1816
net::SocketAddr,
1917
sync::{atomic::Ordering, Arc},

tpu-client-next/src/connection_workers_scheduler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use {
1414
},
1515
log::*,
1616
quinn::Endpoint,
17-
solana_sdk::signature::Keypair,
17+
solana_keypair::Keypair,
1818
std::{net::SocketAddr, sync::Arc},
1919
thiserror::Error,
2020
tokio::sync::mpsc,

tpu-client-next/src/leader_updater.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
use {
1212
async_trait::async_trait,
1313
log::*,
14+
solana_clock::NUM_CONSECUTIVE_LEADER_SLOTS,
1415
solana_connection_cache::connection_cache::Protocol,
1516
solana_rpc_client::nonblocking::rpc_client::RpcClient,
16-
solana_sdk::clock::NUM_CONSECUTIVE_LEADER_SLOTS,
1717
solana_tpu_client::nonblocking::tpu_client::LeaderTpuService,
1818
std::{
1919
fmt,

tpu-client-next/src/quic_networking.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use {
55
crypto::rustls::QuicClientConfig, ClientConfig, Connection, Endpoint, IdleTimeout,
66
TransportConfig,
77
},
8-
solana_sdk::quic::{QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT},
8+
solana_quic_definitions::{QUIC_KEEP_ALIVE, QUIC_MAX_TIMEOUT},
99
solana_streamer::nonblocking::quic::ALPN_TPU_PROTOCOL_ID,
1010
solana_tls_utils::SkipServerVerification,
1111
std::{net::SocketAddr, sync::Arc},

tpu-client-next/src/transaction_batch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This module holds [`TransactionBatch`] structure.
22
3-
use solana_sdk::timing::timestamp;
3+
use solana_time_utils::timestamp;
44

55
/// Batch of generated transactions timestamp is used to discard batches which
66
/// are too old to have valid blockhash.

tpu-client-next/tests/connection_workers_scheduler_test.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ use {
22
crossbeam_channel::Receiver as CrossbeamReceiver,
33
futures::future::BoxFuture,
44
solana_cli_config::ConfigInput,
5+
solana_commitment_config::CommitmentConfig,
6+
solana_keypair::Keypair,
7+
solana_pubkey::Pubkey,
58
solana_rpc_client::nonblocking::rpc_client::RpcClient,
6-
solana_sdk::{
7-
commitment_config::CommitmentConfig,
8-
pubkey::Pubkey,
9-
signer::{keypair::Keypair, Signer},
10-
},
9+
solana_signer::Signer,
1110
solana_streamer::{
1211
nonblocking::testing_utilities::{
1312
make_client_endpoint, setup_quic_server, SpawnTestServerResult, TestServerConfig,

0 commit comments

Comments
 (0)