Fix rules for fork selection (#6906)

automerge
2019-11-15 08:36:33 -08:00
parent e1643c91c4
commit 59413b3124
9 changed files with 424 additions and 104 deletions
--- a/local-cluster/src/cluster_tests.rs
+++ b/local-cluster/src/cluster_tests.rs
@ -192,7 +192,8 @@ pub fn kill_entry_and_spend_and_verify_rest(
    let (cluster_nodes, _) = discover_cluster(&entry_point_info.gossip, nodes).unwrap();
    assert!(cluster_nodes.len() >= nodes);
    let client = create_client(entry_point_info.client_facing_addr(), VALIDATOR_PORT_RANGE);
-    let first_two_epoch_slots = MINIMUM_SLOTS_PER_EPOCH * 3;
+    // sleep long enough to make sure we are in epoch 3
+    let first_two_epoch_slots = MINIMUM_SLOTS_PER_EPOCH * (3 + 1);

    for ingress_node in &cluster_nodes {
        client