gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move and rename cluster_client

Browse Source
This commit is contained in:
Tyera Eulberg
2019-03-12 20:25:52 -06:00
committed by Tyera Eulberg
parent ef7f30e09f
commit 1e8e99cc3e
14 changed files with 70 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/replicator.rs
View File

@@ -12,14 +12,14 @@ use bincode::deserialize;
use solana::blocktree::{
create_new_tmp_ledger, get_tmp_ledger_path, tmp_copy_blocktree, Blocktree,
};
use solana::cluster_client::mk_client;
use solana::cluster_info::{ClusterInfo, Node};
use solana::cluster_info::{ClusterInfo, Node, FULLNODE_PORT_RANGE};
use solana::contact_info::ContactInfo;
use solana::entry::Entry;
use solana::fullnode::{Fullnode, FullnodeConfig};
use solana::replicator::Replicator;
use solana::storage_stage::STORAGE_ROTATE_TEST_COUNT;
use solana::streamer::blob_receiver;
use solana_client::client::create_client;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::hash::Hash;
use solana_sdk::signature::{Keypair, KeypairUtil};
@@ -69,7 +69,8 @@ fn test_replicator_startup_basic() {
let validator_keypair = Arc::new(Keypair::new());
let voting_keypair = Keypair::new();
let mut leader_client = mk_client(&leader_info);
let mut leader_client =
create_client(leader_info.client_facing_addr(), FULLNODE_PORT_RANGE);
let blockhash = leader_client.get_recent_blockhash();
debug!("blockhash: {:?}", blockhash);

11
tests/thin_client.rs
View File

@@ -1,8 +1,9 @@
use bincode::{deserialize, serialize};
use log::*;
use solana::cluster_client::mk_client;
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::{retry_get_balance, ThinClient};
use solana_logger;
use solana_sdk::signature::{Keypair, KeypairUtil};
@@ -22,7 +23,7 @@ fn test_thin_client_basic() {
let bob_pubkey = Keypair::new().pubkey();
discover(&leader_data.gossip, 1).unwrap();
let mut client = mk_client(&leader_data);
let mut client = create_client(leader_data.client_facing_addr(), FULLNODE_PORT_RANGE);
let transaction_count = client.transaction_count();
assert_eq!(transaction_count, 0);
@@ -53,7 +54,7 @@ fn test_bad_sig() {
let bob_pubkey = Keypair::new().pubkey();
discover(&leader_data.gossip, 1).unwrap();
let mut client = mk_client(&leader_data);
let mut client = create_client(leader_data.client_facing_addr(), FULLNODE_PORT_RANGE);
let blockhash = client.get_recent_blockhash();
@@ -84,7 +85,7 @@ fn test_register_vote_account() {
let (server, leader_data, alice, ledger_path) = new_fullnode_for_tests();
discover(&leader_data.gossip, 1).unwrap();
let mut client = mk_client(&leader_data);
let mut client = create_client(leader_data.client_facing_addr(), FULLNODE_PORT_RANGE);
// Create the validator account, transfer some lamports to that account
let validator_keypair = Keypair::new();
@@ -150,7 +151,7 @@ fn test_zero_balance_after_nonzero() {
let bob_keypair = Keypair::new();
discover(&leader_data.gossip, 1).unwrap();
let mut client = mk_client(&leader_data);
let mut client = create_client(leader_data.client_facing_addr(), FULLNODE_PORT_RANGE);
let blockhash = client.get_recent_blockhash();
info!("test_thin_client blockhash: {:?}", blockhash);