Cleanup fullnode rotate integration test, and unignore two tests

2019-02-25 16:17:41 -08:00
parent a2bf59cbba
commit 299b642803
3 changed files with 44 additions and 31 deletions
--- a/src/fullnode.rs
+++ b/src/fullnode.rs
@@ -277,7 +277,20 @@ impl Fullnode {
                        FullnodeReturnType::ValidatorToLeaderRotation
                    }
                }
-                None => FullnodeReturnType::LeaderToLeaderRotation, // value doesn't matter here...
+                None => {
+                    if self
+                        .leader_scheduler
+                        .read()
+                        .unwrap()
+                        .get_leader_for_slot(rotation_info.slot.saturating_sub(1))
+                        .unwrap()
+                        == self.id
+                    {
+                        FullnodeReturnType::LeaderToLeaderRotation
+                    } else {
+                        FullnodeReturnType::ValidatorToLeaderRotation
+                    }
+                }
            };
            self.node_services.tpu.switch_to_leader(
                self.bank_forks.read().unwrap().working_bank(),