eacc69efba
* adds validator flag to allow private ip addresses (#18850)
(cherry picked from commit d2d5f36a3c)
# Conflicts:
# accounts-cluster-bench/Cargo.toml
# bench-tps/Cargo.toml
# cli/Cargo.toml
# core/benches/cluster_info.rs
# core/src/banking_stage.rs
# core/src/broadcast_stage.rs
# core/src/broadcast_stage/broadcast_duplicates_run.rs
# core/src/broadcast_stage/fail_entry_verification_broadcast_run.rs
# core/src/broadcast_stage/standard_broadcast_run.rs
# core/src/cluster_slots_service.rs
# core/src/repair_service.rs
# core/src/tvu.rs
# core/src/validator.rs
# dos/Cargo.toml
# gossip/src/cluster_info.rs
# gossip/src/crds_gossip_pull.rs
# gossip/src/crds_gossip_push.rs
# gossip/src/gossip_service.rs
# local-cluster/Cargo.toml
# local-cluster/src/cluster_tests.rs
# local-cluster/tests/local_cluster.rs
# rpc/Cargo.toml
# rpc/src/rpc.rs
# tokens/Cargo.toml
# validator/Cargo.toml
# validator/src/main.rs
* removes backport merge conflicts
Co-authored-by: behzad nouri <behzadnouri@gmail.com>
87 lines
2.4 KiB
Rust
87 lines
2.4 KiB
Rust
#![allow(clippy::integer_arithmetic)]
|
|
use serial_test::serial;
|
|
use solana_bench_tps::{
|
|
bench::{do_bench_tps, generate_and_fund_keypairs},
|
|
cli::Config,
|
|
};
|
|
use solana_client::thin_client::create_client;
|
|
use solana_core::validator::ValidatorConfig;
|
|
use solana_faucet::faucet::run_local_faucet_with_port;
|
|
use solana_gossip::cluster_info::VALIDATOR_PORT_RANGE;
|
|
use solana_local_cluster::{
|
|
local_cluster::{ClusterConfig, LocalCluster},
|
|
validator_configs::make_identical_validator_configs,
|
|
};
|
|
use solana_sdk::signature::{Keypair, Signer};
|
|
use solana_streamer::socket::SocketAddrSpace;
|
|
use std::{
|
|
sync::{mpsc::channel, Arc},
|
|
time::Duration,
|
|
};
|
|
|
|
fn test_bench_tps_local_cluster(config: Config) {
|
|
let native_instruction_processors = vec![];
|
|
|
|
solana_logger::setup();
|
|
const NUM_NODES: usize = 1;
|
|
let cluster = LocalCluster::new(
|
|
&mut ClusterConfig {
|
|
node_stakes: vec![999_990; NUM_NODES],
|
|
cluster_lamports: 200_000_000,
|
|
validator_configs: make_identical_validator_configs(
|
|
&ValidatorConfig::default(),
|
|
NUM_NODES,
|
|
),
|
|
native_instruction_processors,
|
|
..ClusterConfig::default()
|
|
},
|
|
SocketAddrSpace::Unspecified,
|
|
);
|
|
|
|
let faucet_keypair = Keypair::new();
|
|
cluster.transfer(
|
|
&cluster.funding_keypair,
|
|
&faucet_keypair.pubkey(),
|
|
100_000_000,
|
|
);
|
|
|
|
let client = Arc::new(create_client(
|
|
(cluster.entry_point_info.rpc, cluster.entry_point_info.tpu),
|
|
VALIDATOR_PORT_RANGE,
|
|
));
|
|
|
|
let (addr_sender, addr_receiver) = channel();
|
|
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");
|
|
|
|
let lamports_per_account = 100;
|
|
|
|
let keypair_count = config.tx_count * config.keypair_multiplier;
|
|
let keypairs = generate_and_fund_keypairs(
|
|
client.clone(),
|
|
Some(faucet_addr),
|
|
&config.id,
|
|
keypair_count,
|
|
lamports_per_account,
|
|
)
|
|
.unwrap();
|
|
|
|
let _total = do_bench_tps(client, config, keypairs);
|
|
|
|
#[cfg(not(debug_assertions))]
|
|
assert!(_total > 100);
|
|
}
|
|
|
|
#[test]
|
|
#[serial]
|
|
fn test_bench_tps_local_cluster_solana() {
|
|
test_bench_tps_local_cluster(Config {
|
|
tx_count: 100,
|
|
duration: Duration::from_secs(10),
|
|
..Config::default()
|
|
});
|
|
}
|