Skip to content

Commit f8d6ec2

Browse files
committed
refactor(blockchain): drop SyncStatusTracker::gate_proposer
gate_proposer was a one-line wrapper over duties_allowed() with a single call site. Inline it at the call site as scheduled_proposer.filter(|_| duties_allowed()) and drop the method, so the sync gate is expressed the same way everywhere. Behavior unchanged. The three gate_proposer-only tests collapse onto the duties_allowed() assertions they already carried.
1 parent 47383bf commit f8d6ec2

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

crates/blockchain/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ impl BlockChainServer {
236236
let scheduled_proposer = (interval == 0 && slot > 0)
237237
.then(|| self.get_our_proposer(slot))
238238
.flatten();
239-
let proposer_validator_id = self.sync_status.gate_proposer(scheduled_proposer);
239+
let proposer_validator_id =
240+
scheduled_proposer.filter(|_| self.sync_status.duties_allowed());
240241

241242
if let Some(validator_id) = scheduled_proposer
242243
&& proposer_validator_id.is_none()

crates/blockchain/src/sync_status.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ impl SyncStatusTracker {
4545
pub(crate) fn duties_allowed(&self) -> bool {
4646
!self.syncing
4747
}
48-
49-
pub(crate) fn gate_proposer(&self, proposer: Option<u64>) -> Option<u64> {
50-
proposer.filter(|_| self.duties_allowed())
51-
}
5248
}
5349

5450
#[cfg(test)]
@@ -114,30 +110,27 @@ mod tests {
114110
}
115111

116112
#[test]
117-
fn syncing_gates_proposals_and_attestations() {
113+
fn syncing_blocks_duties() {
118114
let mut tracker = SyncStatusTracker::default();
119115
tracker.update(20, 0, 20);
120116

121117
assert!(!tracker.duties_allowed());
122-
assert_eq!(tracker.gate_proposer(Some(3)), None);
123118
}
124119

125120
#[test]
126-
fn caught_up_node_allows_proposals_and_attestations() {
121+
fn caught_up_node_allows_duties() {
127122
let mut tracker = SyncStatusTracker::default();
128123
tracker.update(20, 0, 20);
129124
tracker.update(20, 18, 20);
130125

131126
assert!(tracker.duties_allowed());
132-
assert_eq!(tracker.gate_proposer(Some(3)), Some(3));
133127
}
134128

135129
#[test]
136-
fn network_stall_keeps_proposals_and_attestations_enabled() {
130+
fn network_stall_keeps_duties_enabled() {
137131
let mut tracker = SyncStatusTracker::default();
138132
tracker.update(100, 0, 0);
139133

140134
assert!(tracker.duties_allowed());
141-
assert_eq!(tracker.gate_proposer(Some(3)), Some(3));
142135
}
143136
}

0 commit comments

Comments
 (0)