Skip to content
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.

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

[qs] remove assertion on timestamp #15306

Merged
merged 1 commit into from
Nov 19, 2024
Merged
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
8 changes: 4 additions & 4 deletions consensus/src/quorum_store/batch_proof_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -715,11 +715,11 @@ impl BatchProofQueue {
}

pub(crate) fn handle_updated_block_timestamp(&mut self, block_timestamp: u64) {
// tolerate asynchronous notification
if self.latest_block_timestamp > block_timestamp {
return;
}
let start = Instant::now();
assert!(
self.latest_block_timestamp <= block_timestamp,
"Decreasing block timestamp"
);
self.latest_block_timestamp = block_timestamp;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we only update when self.latest_block_timestamp <= block_timestamp?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the early return above does it?

if let Some(time_lag) = aptos_infallible::duration_since_epoch()
.checked_sub(Duration::from_micros(block_timestamp))
Expand Down
Loading