From 39f89e5a56bf2724d4c60b92d6fd1405beeb02f5 Mon Sep 17 00:00:00 2001 From: Sagar Dhawan Date: Mon, 9 Sep 2019 19:48:43 -0700 Subject: [PATCH] Fix bench clients reading primordial account files (#5860) * Fix bench-tps balance lookup * Also fix bench-exchange --- bench-exchange/src/bench.rs | 3 ++- bench-tps/src/main.rs | 15 +++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bench-exchange/src/bench.rs b/bench-exchange/src/bench.rs index 4a35eff79..5804ffce2 100644 --- a/bench-exchange/src/bench.rs +++ b/bench-exchange/src/bench.rs @@ -140,7 +140,8 @@ where let path = Path::new(&client_ids_and_stake_file); let file = File::open(path).unwrap(); - let accounts: HashMap = serde_yaml::from_reader(file).unwrap(); + let accounts: HashMap = + serde_yaml::from_reader(file).unwrap(); accounts .into_iter() .map(|(keypair, _)| { diff --git a/bench-tps/src/main.rs b/bench-tps/src/main.rs index 2e94b8ad8..14f8ae0fc 100644 --- a/bench-tps/src/main.rs +++ b/bench-tps/src/main.rs @@ -94,15 +94,18 @@ fn main() { let path = Path::new(&client_ids_and_stake_file); let file = File::open(path).unwrap(); - let accounts: HashMap = serde_yaml::from_reader(file).unwrap(); + let accounts: HashMap = + serde_yaml::from_reader(file).unwrap(); let mut keypairs = vec![]; let mut last_balance = 0; - accounts.into_iter().for_each(|(keypair, balance)| { - let bytes: Vec = serde_json::from_str(keypair.as_str()).unwrap(); - keypairs.push(Keypair::from_bytes(&bytes).unwrap()); - last_balance = balance; - }); + accounts + .into_iter() + .for_each(|(keypair, primordial_account)| { + let bytes: Vec = serde_json::from_str(keypair.as_str()).unwrap(); + keypairs.push(Keypair::from_bytes(&bytes).unwrap()); + last_balance = primordial_account.balance; + }); // Sort keypairs so that do_bench_tps() uses the same subset of accounts for each run. // This prevents the amount of storage needed for bench-tps accounts from creeping up // across multiple runs.