bench_tps test simplification (#24384)

This commit is contained in:
kirill lykov 2022-04-18 09:43:43 +02:00 committed by GitHub
parent b7bf00a9ee
commit 1ae07aab02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 13 deletions

View File

@ -1,6 +1,5 @@
#![allow(clippy::integer_arithmetic)] #![allow(clippy::integer_arithmetic)]
use { use {
crossbeam_channel::unbounded,
serial_test::serial, serial_test::serial,
solana_bench_tps::{ solana_bench_tps::{
bench::{do_bench_tps, generate_and_fund_keypairs}, bench::{do_bench_tps, generate_and_fund_keypairs},
@ -12,7 +11,7 @@ use {
tpu_client::{TpuClient, TpuClientConfig}, tpu_client::{TpuClient, TpuClientConfig},
}, },
solana_core::validator::ValidatorConfig, solana_core::validator::ValidatorConfig,
solana_faucet::faucet::{run_local_faucet, run_local_faucet_with_port}, solana_faucet::faucet::run_local_faucet,
solana_local_cluster::{ solana_local_cluster::{
local_cluster::{ClusterConfig, LocalCluster}, local_cluster::{ClusterConfig, LocalCluster},
validator_configs::make_identical_validator_configs, validator_configs::make_identical_validator_configs,
@ -34,19 +33,9 @@ fn test_bench_tps_local_cluster(config: Config) {
let faucet_keypair = Keypair::new(); let faucet_keypair = Keypair::new();
let faucet_pubkey = faucet_keypair.pubkey(); let faucet_pubkey = faucet_keypair.pubkey();
let (addr_sender, addr_receiver) = unbounded(); let faucet_addr = run_local_faucet(faucet_keypair, None);
run_local_faucet_with_port(faucet_keypair, addr_sender, None, 0);
let faucet_addr = addr_receiver
.recv_timeout(Duration::from_secs(2))
.expect("run_local_faucet")
.expect("faucet_addr");
const NUM_NODES: usize = 1; const NUM_NODES: usize = 1;
let mut validator_config = ValidatorConfig::default_for_test();
validator_config.rpc_config = JsonRpcConfig {
faucet_addr: Some(faucet_addr),
..JsonRpcConfig::default_for_test()
};
let cluster = LocalCluster::new( let cluster = LocalCluster::new(
&mut ClusterConfig { &mut ClusterConfig {
node_stakes: vec![999_990; NUM_NODES], node_stakes: vec![999_990; NUM_NODES],