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

Clean up stray retry_get_balance() function

Browse Source
This commit is contained in:
Michael Vines
2019-03-16 23:29:11 -07:00
parent 42cea7a785
commit 9632136cda
5 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/local_cluster.rs
View File

@ -6,7 +6,7 @@ use crate::gossip_service::discover;
use crate::replicator::Replicator;
use crate::service::Service;
use solana_client::thin_client::create_client;
use solana_client::thin_client::{retry_get_balance, ThinClient};
use solana_client::thin_client::ThinClient;
use solana_sdk::genesis_block::GenesisBlock;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
@ -209,7 +209,9 @@ impl LocalCluster {
client
.retry_transfer(&source_keypair, &mut tx, 5)
.expect("client transfer");
retry_get_balance(client, dest_pubkey, Some(lamports)).expect("get balance")
client
.wait_for_balance(dest_pubkey, Some(lamports))
.expect("get balance")
}
fn create_and_fund_vote_account(
@ -234,7 +236,9 @@ impl LocalCluster {
client
.retry_transfer(&from_account, &mut transaction, 5)
.expect("client transfer");
retry_get_balance(client, &vote_account_pubkey, Some(amount)).expect("get balance");
client
.wait_for_balance(&vote_account_pubkey, Some(amount))
.expect("get balance");
// 2) Set delegate for new vote account
let mut transaction = VoteTransaction::delegate_vote_account(

4
core/src/replicator.rs
View File

@ -14,7 +14,7 @@ use rand::thread_rng;
use rand::Rng;
use solana_client::rpc_client::RpcClient;
use solana_client::rpc_request::RpcRequest;
use solana_client::thin_client::{create_client, retry_get_balance, ThinClient};
use solana_client::thin_client::{create_client, ThinClient};
use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT};
use solana_sdk::hash::{Hash, Hasher};
use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
@ -382,7 +382,7 @@ impl Replicator {
keypair: &Keypair,
cluster_entrypoint: &ContactInfo,
) {
if retry_get_balance(client, &keypair.pubkey(), None).is_none() {
if client.wait_for_balance(&keypair.pubkey(), None).is_none() {
let mut drone_addr = cluster_entrypoint.tpu;
drone_addr.set_port(DRONE_PORT);