Skip to content

Commit 39ce96f

Browse files
kevinheaveykevinheavey
authored
remove solana-sdk from tps-client (#4173)
* remove solana-sdk from tps-client * sort deps
1 parent b1acfbd commit 39ce96f

File tree

7 files changed

+88
-73
lines changed

7 files changed

+88
-73
lines changed

‎Cargo.lock‎

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

‎tps-client/Cargo.toml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,27 @@ edition = { workspace = true }
1010

1111
[dependencies]
1212
log = { workspace = true }
13+
solana-account = { workspace = true }
1314
solana-client = { workspace = true }
15+
solana-client-traits = { workspace = true }
16+
solana-clock = { workspace = true }
17+
solana-commitment-config = { workspace = true }
1418
solana-connection-cache = { workspace = true }
19+
solana-epoch-info = { workspace = true }
20+
solana-hash = { workspace = true }
21+
solana-keypair = { workspace = true }
22+
solana-message = { workspace = true }
23+
solana-pubkey = { workspace = true }
1524
solana-quic-client = { workspace = true }
1625
solana-rpc-client = { workspace = true }
1726
solana-rpc-client-api = { workspace = true }
1827
solana-runtime = { workspace = true }
19-
solana-sdk = { workspace = true }
28+
solana-signature = { workspace = true }
29+
solana-signer = { workspace = true }
2030
solana-streamer = { workspace = true }
2131
solana-tpu-client = { workspace = true }
32+
solana-transaction = { workspace = true }
33+
solana-transaction-error = { workspace = true }
2234
solana-transaction-status = { workspace = true }
2335
thiserror = { workspace = true }
2436

‎tps-client/src/bank_client.rs‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
use {
22
crate::{TpsClient, TpsClientError, TpsClientResult},
3+
solana_account::Account,
4+
solana_client_traits::{AsyncClient, SyncClient},
5+
solana_commitment_config::CommitmentConfig,
6+
solana_epoch_info::EpochInfo,
7+
solana_hash::Hash,
8+
solana_message::Message,
9+
solana_pubkey::Pubkey,
310
solana_rpc_client_api::config::RpcBlockConfig,
411
solana_runtime::bank_client::BankClient,
5-
solana_sdk::{
6-
account::Account,
7-
client::{AsyncClient, SyncClient},
8-
commitment_config::CommitmentConfig,
9-
epoch_info::EpochInfo,
10-
hash::Hash,
11-
message::Message,
12-
pubkey::Pubkey,
13-
signature::Signature,
14-
slot_history::Slot,
15-
transaction::{Result, Transaction},
16-
},
12+
solana_signature::Signature,
13+
solana_transaction::Transaction,
14+
solana_transaction_error::TransactionResult as Result,
1715
solana_transaction_status::UiConfirmedBlock,
1816
};
1917

@@ -122,22 +120,22 @@ impl TpsClient for BankClient {
122120
fn get_slot_with_commitment(
123121
&self,
124122
commitment_config: CommitmentConfig,
125-
) -> TpsClientResult<Slot> {
123+
) -> TpsClientResult<u64> {
126124
SyncClient::get_slot_with_commitment(self, commitment_config).map_err(|err| err.into())
127125
}
128126

129127
fn get_blocks_with_commitment(
130128
&self,
131-
_start_slot: Slot,
132-
_end_slot: Option<Slot>,
129+
_start_slot: u64,
130+
_end_slot: Option<u64>,
133131
_commitment_config: CommitmentConfig,
134-
) -> TpsClientResult<Vec<Slot>> {
132+
) -> TpsClientResult<Vec<u64>> {
135133
unimplemented!("BankClient doesn't support get_blocks");
136134
}
137135

138136
fn get_block_with_config(
139137
&self,
140-
_slot: Slot,
138+
_slot: u64,
141139
_rpc_block_config: RpcBlockConfig,
142140
) -> TpsClientResult<UiConfirmedBlock> {
143141
unimplemented!("BankClient doesn't support get_block_with_config");

‎tps-client/src/lib.rs‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
use {
22
log::debug,
3+
solana_account::Account,
4+
solana_clock::DEFAULT_MS_PER_SLOT,
5+
solana_commitment_config::CommitmentConfig,
6+
solana_epoch_info::EpochInfo,
7+
solana_hash::Hash,
8+
solana_message::Message,
9+
solana_pubkey::Pubkey,
310
solana_rpc_client_api::{client_error::Error as ClientError, config::RpcBlockConfig},
4-
solana_sdk::{
5-
account::Account,
6-
clock::DEFAULT_MS_PER_SLOT,
7-
commitment_config::CommitmentConfig,
8-
epoch_info::EpochInfo,
9-
hash::Hash,
10-
message::Message,
11-
pubkey::Pubkey,
12-
signature::Signature,
13-
slot_history::Slot,
14-
transaction::{Result, Transaction},
15-
transport::TransportError,
16-
},
11+
solana_signature::Signature,
1712
solana_tpu_client::tpu_client::TpuSenderError,
13+
solana_transaction::Transaction,
14+
solana_transaction_error::{TransactionResult as Result, TransportError},
1815
solana_transaction_status::UiConfirmedBlock,
1916
std::{
2017
thread::sleep,
@@ -126,21 +123,19 @@ pub trait TpsClient {
126123

127124
fn get_multiple_accounts(&self, pubkeys: &[Pubkey]) -> TpsClientResult<Vec<Option<Account>>>;
128125

129-
fn get_slot_with_commitment(
130-
&self,
131-
commitment_config: CommitmentConfig,
132-
) -> TpsClientResult<Slot>;
126+
fn get_slot_with_commitment(&self, commitment_config: CommitmentConfig)
127+
-> TpsClientResult<u64>;
133128

134129
fn get_blocks_with_commitment(
135130
&self,
136-
start_slot: Slot,
137-
end_slot: Option<Slot>,
131+
start_slot: u64,
132+
end_slot: Option<u64>,
138133
commitment_config: CommitmentConfig,
139-
) -> TpsClientResult<Vec<Slot>>;
134+
) -> TpsClientResult<Vec<u64>>;
140135

141136
fn get_block_with_config(
142137
&self,
143-
slot: Slot,
138+
slot: u64,
144139
rpc_block_config: RpcBlockConfig,
145140
) -> TpsClientResult<UiConfirmedBlock>;
146141
}

‎tps-client/src/rpc_client.rs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
use {
22
crate::{TpsClient, TpsClientError, TpsClientResult},
3+
solana_account::Account,
34
solana_client::rpc_config::RpcSendTransactionConfig,
5+
solana_commitment_config::CommitmentConfig,
6+
solana_epoch_info::EpochInfo,
7+
solana_hash::Hash,
8+
solana_message::Message,
9+
solana_pubkey::Pubkey,
410
solana_rpc_client::rpc_client::RpcClient,
511
solana_rpc_client_api::config::RpcBlockConfig,
6-
solana_sdk::{
7-
account::Account,
8-
commitment_config::CommitmentConfig,
9-
epoch_info::EpochInfo,
10-
hash::Hash,
11-
message::Message,
12-
pubkey::Pubkey,
13-
signature::Signature,
14-
slot_history::Slot,
15-
transaction::{Result, Transaction},
16-
},
12+
solana_signature::Signature,
13+
solana_transaction::Transaction,
14+
solana_transaction_error::TransactionResult as Result,
1715
solana_transaction_status::UiConfirmedBlock,
1816
};
1917

@@ -134,23 +132,23 @@ impl TpsClient for RpcClient {
134132
fn get_slot_with_commitment(
135133
&self,
136134
commitment_config: CommitmentConfig,
137-
) -> TpsClientResult<Slot> {
135+
) -> TpsClientResult<u64> {
138136
RpcClient::get_slot_with_commitment(self, commitment_config).map_err(|err| err.into())
139137
}
140138

141139
fn get_blocks_with_commitment(
142140
&self,
143-
start_slot: Slot,
144-
end_slot: Option<Slot>,
141+
start_slot: u64,
142+
end_slot: Option<u64>,
145143
commitment_config: CommitmentConfig,
146-
) -> TpsClientResult<Vec<Slot>> {
144+
) -> TpsClientResult<Vec<u64>> {
147145
RpcClient::get_blocks_with_commitment(self, start_slot, end_slot, commitment_config)
148146
.map_err(|err| err.into())
149147
}
150148

151149
fn get_block_with_config(
152150
&self,
153-
slot: Slot,
151+
slot: u64,
154152
rpc_block_config: RpcBlockConfig,
155153
) -> TpsClientResult<UiConfirmedBlock> {
156154
RpcClient::get_block_with_config(self, slot, rpc_block_config).map_err(|err| err.into())

‎tps-client/src/tpu_client.rs‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
use {
22
crate::{TpsClient, TpsClientError, TpsClientResult},
3+
solana_account::Account,
4+
solana_commitment_config::CommitmentConfig,
35
solana_connection_cache::connection_cache::{
46
ConnectionManager, ConnectionPool, NewConnectionConfig,
57
},
8+
solana_epoch_info::EpochInfo,
9+
solana_hash::Hash,
10+
solana_message::Message,
11+
solana_pubkey::Pubkey,
612
solana_rpc_client_api::config::RpcBlockConfig,
7-
solana_sdk::{
8-
account::Account,
9-
commitment_config::CommitmentConfig,
10-
epoch_info::EpochInfo,
11-
hash::Hash,
12-
message::Message,
13-
pubkey::Pubkey,
14-
signature::Signature,
15-
slot_history::Slot,
16-
transaction::{Result, Transaction},
17-
},
13+
solana_signature::Signature,
1814
solana_tpu_client::tpu_client::TpuClient,
15+
solana_transaction::Transaction,
16+
solana_transaction_error::TransactionResult as Result,
1917
solana_transaction_status::UiConfirmedBlock,
2018
};
2119

@@ -155,26 +153,26 @@ where
155153
fn get_slot_with_commitment(
156154
&self,
157155
commitment_config: CommitmentConfig,
158-
) -> TpsClientResult<Slot> {
156+
) -> TpsClientResult<u64> {
159157
self.rpc_client()
160158
.get_slot_with_commitment(commitment_config)
161159
.map_err(|err| err.into())
162160
}
163161

164162
fn get_blocks_with_commitment(
165163
&self,
166-
start_slot: Slot,
167-
end_slot: Option<Slot>,
164+
start_slot: u64,
165+
end_slot: Option<u64>,
168166
commitment_config: CommitmentConfig,
169-
) -> TpsClientResult<Vec<Slot>> {
167+
) -> TpsClientResult<Vec<u64>> {
170168
self.rpc_client()
171169
.get_blocks_with_commitment(start_slot, end_slot, commitment_config)
172170
.map_err(|err| err.into())
173171
}
174172

175173
fn get_block_with_config(
176174
&self,
177-
slot: Slot,
175+
slot: u64,
178176
rpc_block_config: RpcBlockConfig,
179177
) -> TpsClientResult<UiConfirmedBlock> {
180178
self.rpc_client()

‎tps-client/src/utils.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
use {
22
log::{error, info},
33
solana_client::connection_cache::ConnectionCache as ClientConnectionCache,
4+
solana_keypair::Keypair,
5+
solana_pubkey::Pubkey,
46
solana_rpc_client::rpc_client::RpcClient,
5-
solana_sdk::{pubkey::Pubkey, signature::Signer, signer::keypair::Keypair},
7+
solana_signer::Signer,
68
solana_streamer::streamer::StakedNodes,
79
std::{
810
collections::HashMap,

0 commit comments

Comments
 (0)