gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix so that we don't hit end of epoch - leader not found before trying to transfer

Browse Source
This commit is contained in:
Carl
2019-03-22 20:47:32 -07:00
parent 68a8b955bc
commit e32f798d5f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/cluster_tests.rs
View File

@ -119,21 +119,21 @@ pub fn verify_ledger_ticks(ledger_path: &str, ticks_per_slot: usize) {
} }
pub fn sleep_n_epochs( pub fn sleep_n_epochs(
num_epochs: u64, num_epochs: f64,
config: &PohServiceConfig, config: &PohServiceConfig,
ticks_per_slot: u64, ticks_per_slot: u64,
slots_per_epoch: u64, slots_per_epoch: u64,
) { ) {
let num_ticks_per_second = { let num_ticks_per_second = {
match config { match config {
PohServiceConfig::Sleep(d) => (1000 / d.as_millis()) as u64, PohServiceConfig::Sleep(d) => (1000 / d.as_millis()) as f64,
_ => panic!("Unsuppported tick config for testing"), _ => panic!("Unsuppported tick config for testing"),
} }
}; };
let num_ticks_to_sleep = num_epochs * ticks_per_slot * slots_per_epoch; let num_ticks_to_sleep = num_epochs * ticks_per_slot as f64 * slots_per_epoch as f64;
sleep(Duration::from_secs( sleep(Duration::from_secs(
(num_ticks_to_sleep + num_ticks_per_second - 1) / num_ticks_per_second, ((num_ticks_to_sleep + num_ticks_per_second - 1.0) / num_ticks_per_second) as u64,
)); ));
} }

6
tests/local_cluster.rs
View File

@ -111,7 +111,7 @@ fn test_two_unbalanced_stakes() {
num_slots_per_epoch, num_slots_per_epoch,
); );
cluster_tests::sleep_n_epochs( cluster_tests::sleep_n_epochs(
10, 10.0,
&fullnode_config.tick_config, &fullnode_config.tick_config,
num_ticks_per_slot, num_ticks_per_slot,
num_slots_per_epoch, num_slots_per_epoch,
@ -154,14 +154,14 @@ fn test_restart_node() {
); );
let nodes = cluster.get_node_ids(); let nodes = cluster.get_node_ids();
cluster_tests::sleep_n_epochs( cluster_tests::sleep_n_epochs(
1, 1.0,
&fullnode_config.tick_config, &fullnode_config.tick_config,
timing::DEFAULT_TICKS_PER_SLOT, timing::DEFAULT_TICKS_PER_SLOT,
slots_per_epoch, slots_per_epoch,
); );
cluster.restart_node(nodes[0]); cluster.restart_node(nodes[0]);
cluster_tests::sleep_n_epochs( cluster_tests::sleep_n_epochs(
1, 0.5,
&fullnode_config.tick_config, &fullnode_config.tick_config,
timing::DEFAULT_TICKS_PER_SLOT, timing::DEFAULT_TICKS_PER_SLOT,
slots_per_epoch, slots_per_epoch,