Use new client crates (#27360)

* Update ancillary cli crates * Update cli * Update command-line tools * Update rpc, etc * Update client-test * Update core, validator * Update local-cluster
solana-labs · Aug 24, 2022 · b8b3d72 · b8b3d72
1 parent 62eebe6
commit b8b3d72
Show file tree

Hide file tree

Showing 99 changed files with 390 additions and 331 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
@@ -21,6 +21,7 @@ solana-gossip = { path = "../gossip", version = "=1.12.0" }
 solana-logger = { path = "../logger", version = "=1.12.0" }
 solana-measure = { path = "../measure", version = "=1.12.0" }
 solana-net-utils = { path = "../net-utils", version = "=1.12.0" }
+solana-rpc-client = { path = "../rpc-client", version = "=1.12.0" }
 solana-runtime = { path = "../runtime", version = "=1.12.0" }
 solana-sdk = { path = "../sdk", version = "=1.12.0" }
 solana-streamer = { path = "../streamer", version = "=1.12.0" }

diff --git a/accounts-cluster-bench/src/main.rs b/accounts-cluster-bench/src/main.rs
@@ -6,9 +6,10 @@ use {
     rayon::prelude::*,
     solana_account_decoder::parse_token::spl_token_pubkey,
     solana_clap_utils::input_parsers::pubkey_of,
-    solana_client::{rpc_client::RpcClient, transaction_executor::TransactionExecutor},
+    solana_client::transaction_executor::TransactionExecutor,
     solana_faucet::faucet::{request_airdrop_transaction, FAUCET_PORT},
     solana_gossip::gossip_service::discover,
+    solana_rpc_client::rpc_client::RpcClient,
     solana_runtime::inline_spl_token,
     solana_sdk::{
         commitment_config::CommitmentConfig,

diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
@@ -14,7 +14,6 @@ crossbeam-channel = "0.5"
 log = "0.4.17"
 rand = "0.7.0"
 rayon = "1.5.3"
-solana-client = { path = "../client", version = "=1.12.0" }
 solana-core = { path = "../core", version = "=1.12.0" }
 solana-gossip = { path = "../gossip", version = "=1.12.0" }
 solana-ledger = { path = "../ledger", version = "=1.12.0" }
@@ -25,6 +24,7 @@ solana-poh = { path = "../poh", version = "=1.12.0" }
 solana-runtime = { path = "../runtime", version = "=1.12.0" }
 solana-sdk = { path = "../sdk", version = "=1.12.0" }
 solana-streamer = { path = "../streamer", version = "=1.12.0" }
+solana-tpu-client = { path = "../tpu-client", version = "=1.12.0" }
 solana-version = { path = "../version", version = "=1.12.0" }
 
 [package.metadata.docs.rs]

diff --git a/banking-bench/src/main.rs b/banking-bench/src/main.rs
@@ -5,7 +5,6 @@ use {
     log::*,
     rand::{thread_rng, Rng},
     rayon::prelude::*,
-    solana_client::connection_cache::{ConnectionCache, DEFAULT_TPU_CONNECTION_POOL_SIZE},
     solana_core::banking_stage::BankingStage,
     solana_gossip::cluster_info::{ClusterInfo, Node},
     solana_ledger::{
@@ -29,6 +28,7 @@ use {
         transaction::Transaction,
     },
     solana_streamer::socket::SocketAddrSpace,
+    solana_tpu_client::connection_cache::{ConnectionCache, DEFAULT_TPU_CONNECTION_POOL_SIZE},
     std::{
         sync::{atomic::Ordering, Arc, RwLock},
         thread::sleep,

diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
@@ -18,6 +18,7 @@ solana-client = { path = "../client", version = "=1.12.0" }
 solana-runtime = { path = "../runtime", version = "=1.12.0" }
 solana-sdk = { path = "../sdk", version = "=1.12.0" }
 solana-send-transaction-service = { path = "../send-transaction-service", version = "=1.12.0" }
+solana-tpu-client = { path = "../tpu-client", version = "=1.12.0" }
 tarpc = { version = "0.29.0", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 tokio-serde = { version = "0.8", features = ["bincode"] }