client/: Merge client.rs into thin_client.rs

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;

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;

client/src/client.rs

@@ -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)
-}

client/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod client;
 pub mod rpc_mock;
 pub mod rpc_request;
 pub mod rpc_signature_status;

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,

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;

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;

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};

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};

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};