Fix bench clients reading primordial account files (#5860)
* Fix bench-tps balance lookup * Also fix bench-exchange
This commit is contained in:
parent
b881029de3
commit
39f89e5a56
|
@ -140,7 +140,8 @@ where
|
||||||
let path = Path::new(&client_ids_and_stake_file);
|
let path = Path::new(&client_ids_and_stake_file);
|
||||||
let file = File::open(path).unwrap();
|
let file = File::open(path).unwrap();
|
||||||
|
|
||||||
let accounts: HashMap<String, u64> = serde_yaml::from_reader(file).unwrap();
|
let accounts: HashMap<String, PrimordialAccountDetails> =
|
||||||
|
serde_yaml::from_reader(file).unwrap();
|
||||||
accounts
|
accounts
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(keypair, _)| {
|
.map(|(keypair, _)| {
|
||||||
|
|
|
@ -94,15 +94,18 @@ fn main() {
|
||||||
let path = Path::new(&client_ids_and_stake_file);
|
let path = Path::new(&client_ids_and_stake_file);
|
||||||
let file = File::open(path).unwrap();
|
let file = File::open(path).unwrap();
|
||||||
|
|
||||||
let accounts: HashMap<String, u64> = serde_yaml::from_reader(file).unwrap();
|
let accounts: HashMap<String, PrimordialAccountDetails> =
|
||||||
|
serde_yaml::from_reader(file).unwrap();
|
||||||
let mut keypairs = vec![];
|
let mut keypairs = vec![];
|
||||||
let mut last_balance = 0;
|
let mut last_balance = 0;
|
||||||
|
|
||||||
accounts.into_iter().for_each(|(keypair, balance)| {
|
accounts
|
||||||
let bytes: Vec<u8> = serde_json::from_str(keypair.as_str()).unwrap();
|
.into_iter()
|
||||||
keypairs.push(Keypair::from_bytes(&bytes).unwrap());
|
.for_each(|(keypair, primordial_account)| {
|
||||||
last_balance = balance;
|
let bytes: Vec<u8> = 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.
|
// 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
|
// This prevents the amount of storage needed for bench-tps accounts from creeping up
|
||||||
// across multiple runs.
|
// across multiple runs.
|
||||||
|
|
Loading…
Reference in New Issue