Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion crates/blockchain/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ impl BlockChainServer {
let scheduled_proposer = (interval == 0 && slot > 0)
.then(|| self.get_our_proposer(slot))
.flatten();
let proposer_validator_id = self.sync_status.gate_proposer(scheduled_proposer);
let proposer_validator_id =
scheduled_proposer.filter(|_| self.sync_status.duties_allowed());

if let Some(validator_id) = scheduled_proposer
&& proposer_validator_id.is_none()
Expand Down
32 changes: 0 additions & 32 deletions crates/blockchain/src/sync_status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ impl SyncStatusTracker {
pub(crate) fn duties_allowed(&self) -> bool {
!self.syncing
}

pub(crate) fn gate_proposer(&self, proposer: Option<u64>) -> Option<u64> {
proposer.filter(|_| self.duties_allowed())
}
}

#[cfg(test)]
Expand Down Expand Up @@ -112,32 +108,4 @@ mod tests {

assert_eq!(tracker.update(15, 20, 20), SyncStatus::Synced);
}

#[test]
fn syncing_gates_proposals_and_attestations() {
let mut tracker = SyncStatusTracker::default();
tracker.update(20, 0, 20);

assert!(!tracker.duties_allowed());
assert_eq!(tracker.gate_proposer(Some(3)), None);
}

#[test]
fn caught_up_node_allows_proposals_and_attestations() {
let mut tracker = SyncStatusTracker::default();
tracker.update(20, 0, 20);
tracker.update(20, 18, 20);

assert!(tracker.duties_allowed());
assert_eq!(tracker.gate_proposer(Some(3)), Some(3));
}

#[test]
fn network_stall_keeps_proposals_and_attestations_enabled() {
let mut tracker = SyncStatusTracker::default();
tracker.update(100, 0, 0);

assert!(tracker.duties_allowed());
assert_eq!(tracker.gate_proposer(Some(3)), Some(3));
}
}