blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid panicking if poll_get_balance() fails while in the transaction loop

This commit is contained in:
Michael Vines 2018-07-24 23:15:09 -07:00 committed by Grimes
parent 327ba5301d
commit f0725b4900
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/bench-tps.rs
View File

@ -297,7 +297,7 @@ fn main() {
let mut client = mk_client(&leader); let mut client = mk_client(&leader);
let starting_balance = client.poll_get_balance(&id.pubkey()).unwrap(); let starting_balance = client.poll_get_balance(&id.pubkey()).unwrap();
println!("Token balance: {:?}", starting_balance); println!("Token balance: {}", starting_balance);
let txs: i64 = 500_000; let txs: i64 = 500_000;
if starting_balance < txs { if starting_balance < txs {
@ -321,7 +321,7 @@ fn main() {
} }
println!("."); println!(".");
} }
println!("Token balance: {:?}", current_balance); println!("Token balance: {}", current_balance);
if current_balance - starting_balance != airdrop_amount { if current_balance - starting_balance != airdrop_amount {
println!("Airdrop failed!"); println!("Airdrop failed!");
exit(1); exit(1);
@ -336,7 +336,7 @@ fn main() {
seed.copy_from_slice(&id.public_key_bytes()[..32]); seed.copy_from_slice(&id.public_key_bytes()[..32]);
let rnd = GenKeys::new(seed); let rnd = GenKeys::new(seed);
println!("Creating keypairs..."); println!("Creating {} keypairs...", txs / 2);
let keypairs = rnd.gen_n_keypairs(txs / 2); let keypairs = rnd.gen_n_keypairs(txs / 2);
let first_tx_count = client.transaction_count(); let first_tx_count = client.transaction_count();
@ -368,8 +368,8 @@ fn main() {
let now = Instant::now(); let now = Instant::now();
let mut reclaim_tokens_back_to_source_account = false; let mut reclaim_tokens_back_to_source_account = false;
while now.elapsed() < time || reclaim_tokens_back_to_source_account { while now.elapsed() < time || reclaim_tokens_back_to_source_account {
let balance = client.poll_get_balance(&id.pubkey()).unwrap(); let balance = client.poll_get_balance(&id.pubkey()).unwrap_or(-1);
println!("Token balance: {:?}", balance); println!("Token balance: {}", balance);
// ping-pong between source and destination accounts for each loop iteration // ping-pong between source and destination accounts for each loop iteration
// this seems to be faster than trying to determine the balance of individual // this seems to be faster than trying to determine the balance of individual
@ -394,8 +394,8 @@ fn main() {
t.join().unwrap(); t.join().unwrap();
} }
let balance = client.poll_get_balance(&id.pubkey()).unwrap(); let balance = client.poll_get_balance(&id.pubkey()).unwrap_or(-1);
println!("Token balance: {:?}", balance); println!("Token balance: {}", balance);
// Compute/report stats // Compute/report stats
let mut max_of_maxes = 0.0; let mut max_of_maxes = 0.0;