Skip to content
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
7 changes: 6 additions & 1 deletion lightning/src/util/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ impl Time for std::time::Instant {
}

fn duration_since(&self, earlier: Self) -> Duration {
self.duration_since(earlier)
// On rust prior to 1.60 `Instant::duration_since` will panic if time goes backwards.
// However, we support rust versions prior to 1.60 and some users appear to have "monotonic
// clocks" that go backwards in practice (likely relatively ancient kernels/etc). Thus, we
// manually check for time going backwards here and return a duration of zero in that case.
let now = Self::now();
if now > earlier { now - earlier } else { Duration::from_secs(0) }
}

fn duration_since_epoch() -> Duration {
Expand Down