From 23337e08ebd39aae1aa45e2b7a8d943494fde3a2 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Sat, 16 Mar 2019 22:13:44 -0700 Subject: [PATCH] client/: Merge client.rs into thin_client.rs --- bench-tps/src/bench.rs | 2 +- bench-tps/src/main.rs | 2 +- client/src/client.rs | 17 ----------------- client/src/lib.rs | 1 - client/src/thin_client.rs | 14 ++++++++++++++ core/src/cluster_tests.rs | 2 +- core/src/local_cluster.rs | 2 +- core/src/replicator.rs | 2 +- core/src/storage_stage.rs | 2 +- tests/thin_client.rs | 2 +- 10 files changed, 21 insertions(+), 25 deletions(-) delete mode 100644 client/src/client.rs diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs index 98c8955f8..b67a95430 100644 --- a/bench-tps/src/bench.rs +++ b/bench-tps/src/bench.rs @@ -3,7 +3,7 @@ use solana_metrics; use rayon::prelude::*; use solana::cluster_info::FULLNODE_PORT_RANGE; use solana::contact_info::ContactInfo; -use solana_client::client::create_client; +use solana_client::thin_client::create_client; use solana_client::thin_client::ThinClient; use solana_drone::drone::request_airdrop_transaction; use solana_metrics::influxdb; diff --git a/bench-tps/src/main.rs b/bench-tps/src/main.rs index 85654fe15..f0192f503 100644 --- a/bench-tps/src/main.rs +++ b/bench-tps/src/main.rs @@ -5,7 +5,7 @@ use crate::bench::*; use solana::cluster_info::FULLNODE_PORT_RANGE; use solana::gen_keys::GenKeys; use solana::gossip_service::discover; -use solana_client::client::create_client; +use solana_client::thin_client::create_client; use solana_metrics; use solana_sdk::signature::{Keypair, KeypairUtil}; use std::collections::VecDeque; diff --git a/client/src/client.rs b/client/src/client.rs deleted file mode 100644 index 2581eeaed..000000000 --- a/client/src/client.rs +++ /dev/null @@ -1,17 +0,0 @@ -use crate::thin_client::ThinClient; -use std::net::SocketAddr; -use std::time::Duration; - -pub fn create_client((rpc, tpu): (SocketAddr, SocketAddr), range: (u16, u16)) -> ThinClient { - let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap(); - ThinClient::new(rpc, tpu, transactions_socket) -} - -pub fn create_client_with_timeout( - (rpc, tpu): (SocketAddr, SocketAddr), - range: (u16, u16), - timeout: Duration, -) -> ThinClient { - let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap(); - ThinClient::new_socket_with_timeout(rpc, tpu, transactions_socket, timeout) -} diff --git a/client/src/lib.rs b/client/src/lib.rs index e64b74af0..527164335 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -1,4 +1,3 @@ -pub mod client; pub mod rpc_mock; pub mod rpc_request; pub mod rpc_signature_status; diff --git a/client/src/thin_client.rs b/client/src/thin_client.rs index 9b39b6e46..00c1bbaff 100644 --- a/client/src/thin_client.rs +++ b/client/src/thin_client.rs @@ -202,6 +202,20 @@ impl Drop for ThinClient { } } +pub fn create_client((rpc, tpu): (SocketAddr, SocketAddr), range: (u16, u16)) -> ThinClient { + let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap(); + ThinClient::new(rpc, tpu, transactions_socket) +} + +pub fn create_client_with_timeout( + (rpc, tpu): (SocketAddr, SocketAddr), + range: (u16, u16), + timeout: Duration, +) -> ThinClient { + let (_, transactions_socket) = solana_netutil::bind_in_range(range).unwrap(); + ThinClient::new_socket_with_timeout(rpc, tpu, transactions_socket, timeout) +} + pub fn retry_get_balance( client: &ThinClient, bob_pubkey: &Pubkey, diff --git a/core/src/cluster_tests.rs b/core/src/cluster_tests.rs index 66f65f1bf..817ec8e2f 100644 --- a/core/src/cluster_tests.rs +++ b/core/src/cluster_tests.rs @@ -7,7 +7,7 @@ use crate::cluster_info::FULLNODE_PORT_RANGE; use crate::contact_info::ContactInfo; use crate::entry::{Entry, EntrySlice}; use crate::gossip_service::discover; -use solana_client::client::create_client; +use solana_client::thin_client::create_client; use solana_sdk::hash::Hash; use solana_sdk::signature::{Keypair, KeypairUtil, Signature}; use solana_sdk::system_transaction::SystemTransaction; diff --git a/core/src/local_cluster.rs b/core/src/local_cluster.rs index 6c97ad300..670e1ece3 100644 --- a/core/src/local_cluster.rs +++ b/core/src/local_cluster.rs @@ -5,7 +5,7 @@ use crate::fullnode::{Fullnode, FullnodeConfig}; use crate::gossip_service::discover; use crate::replicator::Replicator; use crate::service::Service; -use solana_client::client::create_client; +use solana_client::thin_client::create_client; use solana_client::thin_client::{retry_get_balance, ThinClient}; use solana_sdk::genesis_block::GenesisBlock; use solana_sdk::pubkey::Pubkey; diff --git a/core/src/replicator.rs b/core/src/replicator.rs index 11800976f..8734c7b83 100644 --- a/core/src/replicator.rs +++ b/core/src/replicator.rs @@ -12,8 +12,8 @@ use crate::storage_stage::{get_segment_from_entry, ENTRIES_PER_SEGMENT}; use crate::window_service::WindowService; use rand::thread_rng; use rand::Rng; -use solana_client::client::create_client; use solana_client::rpc_request::{RpcClient, RpcRequest, RpcRequestHandler}; +use solana_client::thin_client::create_client; use solana_client::thin_client::{retry_get_balance, ThinClient}; use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT}; use solana_sdk::hash::{Hash, Hasher}; diff --git a/core/src/storage_stage.rs b/core/src/storage_stage.rs index ab9ae9b85..948ce1c17 100644 --- a/core/src/storage_stage.rs +++ b/core/src/storage_stage.rs @@ -12,7 +12,7 @@ use crate::service::Service; use bincode::deserialize; use rand::{Rng, SeedableRng}; use rand_chacha::ChaChaRng; -use solana_client::client::create_client_with_timeout; +use solana_client::thin_client::create_client_with_timeout; use solana_sdk::hash::Hash; use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{Keypair, Signature}; diff --git a/tests/thin_client.rs b/tests/thin_client.rs index 0404d17d3..88d7f5fed 100644 --- a/tests/thin_client.rs +++ b/tests/thin_client.rs @@ -3,7 +3,7 @@ use log::*; use solana::cluster_info::FULLNODE_PORT_RANGE; use solana::fullnode::new_fullnode_for_tests; use solana::gossip_service::discover; -use solana_client::client::create_client; +use solana_client::thin_client::create_client; use solana_client::thin_client::{retry_get_balance, ThinClient}; use solana_logger; use solana_sdk::signature::{Keypair, KeypairUtil};