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

honor environment variable SOLANA_DYNAMIC_NODES, obviating need to edit+compile for re-test

This commit is contained in:
Rob Walker 2018-07-25 14:43:30 -07:00
parent f372840354
commit 297896bc49
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/multinode.rs
View File

@ -15,6 +15,7 @@ use solana::service::Service;
use solana::signature::{KeyPair, KeyPairUtil, PublicKey}; use solana::signature::{KeyPair, KeyPairUtil, PublicKey};
use solana::streamer::default_window; use solana::streamer::default_window;
use solana::thin_client::ThinClient; use solana::thin_client::ThinClient;
use std::env;
use std::fs::File; use std::fs::File;
use std::net::UdpSocket; use std::net::UdpSocket;
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
@ -370,7 +371,13 @@ fn test_leader_restart_validator_start_from_old_ledger() {
#[ignore] #[ignore]
fn test_multi_node_dynamic_network() { fn test_multi_node_dynamic_network() {
logger::setup(); logger::setup();
const N: usize = 60; let key = "SOLANA_DYNAMIC_NODES";
let num_nodes: usize = match env::var(key) {
Ok(val) => val.parse()
.expect(&format!("env var {} is not parse-able as usize", key)),
Err(_) => 60,
};
let leader = TestNode::new_localhost(); let leader = TestNode::new_localhost();
let bob_pubkey = KeyPair::new().pubkey(); let bob_pubkey = KeyPair::new().pubkey();
let (alice, ledger_path) = genesis(100_000); let (alice, ledger_path) = genesis(100_000);
@ -399,7 +406,7 @@ fn test_multi_node_dynamic_network() {
).unwrap(); ).unwrap();
assert_eq!(leader_balance, 1000); assert_eq!(leader_balance, 1000);
let t1: Vec<_> = (0..N) let t1: Vec<_> = (0..num_nodes)
.into_iter() .into_iter()
.map(|n| { .map(|n| {
let leader_data = leader_data.clone(); let leader_data = leader_data.clone();
@ -417,7 +424,12 @@ fn test_multi_node_dynamic_network() {
Some(500), Some(500),
); );
assert_eq!(bal, Some(500)); assert_eq!(bal, Some(500));
info!("sent balance to[{}/{}] {:x}", n, N, keypair.pubkey()); info!(
"sent balance to[{}/{}] {:x}",
n,
num_nodes,
keypair.pubkey()
);
keypair keypair
}) })
.unwrap() .unwrap()
@ -455,7 +467,7 @@ fn test_multi_node_dynamic_network() {
let validators: Vec<_> = t2.into_iter().map(|t| t.join().unwrap()).collect(); let validators: Vec<_> = t2.into_iter().map(|t| t.join().unwrap()).collect();
let mut consecutive_success = 0; let mut consecutive_success = 0;
for i in 0..N { for i in 0..num_nodes {
//verify leader can do transfer //verify leader can do transfer
let expected = ((i + 3) * 500) as i64; let expected = ((i + 3) * 500) as i64;
let leader_balance = send_tx_and_retry_get_balance( let leader_balance = send_tx_and_retry_get_balance(