Skip to content

A0-1796: add justification broadcast ticker #833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maciejnems merged 14 commits into from
Dec 29, 2022
Merged

A0-1796: add justification broadcast ticker #833

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b4809b3
add justification broadcast ticker
maciejnems Dec 28, 2022
ebe044c
Merge branch 'main' into A0-1796-broadcast-ticker
maciejnems Dec 28, 2022
c989c8e
Join periodic and normal broadcast last Instant
maciejnems Dec 28, 2022
78c5068
move clippy dead code
maciejnems Dec 28, 2022
d5a908b
rename to ticker
maciejnems Dec 28, 2022
bf0011c
restructure tests
maciejnems Dec 28, 2022
ab8954c
change timeout after try tick true
maciejnems Dec 28, 2022
0d138ab
hmmmmmm
maciejnems Dec 28, 2022
4a0d9ad
apply suggested changes to docs
maciejnems Dec 29, 2022
699b965
add assert to constructor
maciejnems Dec 29, 2022
d5a351c
or maybe no assert
maciejnems Dec 29, 2022
2d645e3
the in docs
maciejnems Dec 29, 2022
3cc1a9e
wait_and_tick
maciejnems Dec 29, 2022
10c94e5
Merge branch 'main' into A0-1796-broadcast-ticker
maciejnems Dec 29, 2022
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
Prev Previous commit
Next Next commit
wait_and_tick
  • Loading branch information
@maciejnems
maciejnems committed Dec 29, 2022
commit 3cc1a9e43825a8d94760da683677569f83058cc7
33 changes: 24 additions & 9 deletions finality-aleph/src/sync/ticker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl Ticker {

/// Sleeps until next tick should happen.
/// When enough time elapsed, returns and records a tick.
pub async fn wait(&mut self) {
pub async fn wait_and_tick(&mut self) {
let since_last = Instant::now().saturating_duration_since(self.last_tick);
sleep(self.current_timeout.saturating_sub(since_last)).await;
self.current_timeout = self.max_timeout;
Expand Down Expand Up @@ -82,8 +82,11 @@ mod tests {
async fn wait() {
let mut ticker = setup_ticker();

assert_ne!(timeout(MIN_TIMEOUT_PLUS, ticker.wait()).await, Ok(()));
assert_eq!(timeout(MAX_TIMEOUT, ticker.wait()).await, Ok(()));
assert_ne!(
timeout(MIN_TIMEOUT_PLUS, ticker.wait_and_tick()).await,
Ok(())
);
assert_eq!(timeout(MAX_TIMEOUT, ticker.wait_and_tick()).await, Ok(()));
}

#[tokio::test]
Expand All @@ -94,8 +97,11 @@ mod tests {
sleep(MIN_TIMEOUT).await;
assert!(ticker.try_tick());

assert_ne!(timeout(MIN_TIMEOUT_PLUS, ticker.wait()).await, Ok(()));
assert_eq!(timeout(MAX_TIMEOUT, ticker.wait()).await, Ok(()));
assert_ne!(
timeout(MIN_TIMEOUT_PLUS, ticker.wait_and_tick()).await,
Ok(())
);
assert_eq!(timeout(MAX_TIMEOUT, ticker.wait_and_tick()).await, Ok(()));
}

#[tokio::test]
Expand All @@ -104,16 +110,25 @@ mod tests {

assert!(!ticker.try_tick());

assert_eq!(timeout(MIN_TIMEOUT_PLUS, ticker.wait()).await, Ok(()));
assert_ne!(timeout(MIN_TIMEOUT_PLUS, ticker.wait()).await, Ok(()));
assert_eq!(timeout(MAX_TIMEOUT, ticker.wait()).await, Ok(()));
assert_eq!(
timeout(MIN_TIMEOUT_PLUS, ticker.wait_and_tick()).await,
Ok(())
);
assert_ne!(
timeout(MIN_TIMEOUT_PLUS, ticker.wait_and_tick()).await,
Ok(())
);
assert_eq!(timeout(MAX_TIMEOUT, ticker.wait_and_tick()).await, Ok(()));
}

#[tokio::test]
async fn try_tick_after_wait() {
let mut ticker = setup_ticker();

assert_eq!(timeout(MAX_TIMEOUT_PLUS, ticker.wait()).await, Ok(()));
assert_eq!(
timeout(MAX_TIMEOUT_PLUS, ticker.wait_and_tick()).await,
Ok(())
);

assert!(!ticker.try_tick());
sleep(MIN_TIMEOUT).await;
Expand Down