Replace Instant wiht MonotonicTime in outbound_payment.rs

Author: andrei-21

lightning/src/ln/outbound_payment.rs

@@ -239,7 +239,7 @@ impl Retry {
 			},
 			#[cfg(all(not(feature = "no-std"), not(test)))]
 			(Retry::Timeout(max_duration), PaymentAttempts { first_attempted_at, .. }) =>
-				*max_duration >= std::time::Instant::now().duration_since(*first_attempted_at),
+				*max_duration >= crate::util::time::MonotonicTime::now().duration_since(*first_attempted_at),
 			#[cfg(all(not(feature = "no-std"), test))]
 			(Retry::Timeout(max_duration), PaymentAttempts { first_attempted_at, .. }) =>
 				*max_duration >= SinceEpoch::now().duration_since(*first_attempted_at),
@@ -274,7 +274,7 @@ pub(crate) struct PaymentAttemptsUsingTime<T: Time> {
 }
 
 #[cfg(not(any(feature = "no-std", test)))]
-type ConfiguredTime = std::time::Instant;
+type ConfiguredTime = crate::util::time::MonotonicTime;
 #[cfg(feature = "no-std")]
 type ConfiguredTime = crate::util::time::Eternity;
 #[cfg(all(not(feature = "no-std"), test))]

lightning/src/util/time.rs

@@ -103,33 +103,9 @@ impl Sub<Duration> for MonotonicTime {
 	}
 }
 
-#[cfg(not(feature = "no-std"))]
-impl Time for std::time::Instant {
-	fn now() -> Self {
-		std::time::Instant::now()
-	}
-
-	fn duration_since(&self, earlier: Self) -> Duration {
-		// 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 {
-		use std::time::SystemTime;
-		SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap()
-	}
-	fn elapsed(&self) -> Duration {
-		std::time::Instant::elapsed(self)
-	}
-}
-
 #[cfg(test)]
 pub mod tests {
-	use super::{Time, Eternity, MonotonicTime};
+	use super::{Time, Eternity};
 
 	use core::time::Duration;
 	use core::ops::Sub;
@@ -201,8 +177,9 @@ pub mod tests {
 	}
 
 	#[test]
+	#[cfg(not(feature = "no-std"))]
 	fn monotonic_time_go_backward() {
-		let now = MonotonicTime::now();
+		let now = super::MonotonicTime::now();
 		let ten_years = Duration::from_secs(10 * 365 * 24 * 60 * 60);
 		let _past = now - ten_years;
 	}