f - Make Time require Sub<Duration, Output = Self>

Author: jkczyz

lightning/src/routing/scorer.rs

@@ -79,7 +79,7 @@ pub type DefaultTime = Eternity;
 /// [`routing::Score`] implementation parameterized by [`Time`].
 ///
 /// See [`Scorer`] for details.
-pub struct ScorerUsingTime<T: Time + Sub<Duration, Output = T>> {
+pub struct ScorerUsingTime<T: Time> {
 	params: ScoringParameters,
 	// TODO: Remove entries of closed channels.
 	channel_failures: HashMap<u64, ChannelFailure<T>>,
@@ -116,7 +116,7 @@ impl_writeable_tlv_based!(ScoringParameters, {
 /// Accounting for penalties from channel failures.
 ///
 /// Penalties decay over time, though accumulate as more failures occur.
-struct ChannelFailure<T: Time + Sub<Duration, Output = T>> {
+struct ChannelFailure<T: Time> {
 	/// Accumulated penalty in msats for the channel as of `last_failed`.
 	undecayed_penalty_msat: u64,
 
@@ -125,15 +125,15 @@ struct ChannelFailure<T: Time + Sub<Duration, Output = T>> {
 }
 
 /// A measurement of time.
-pub trait Time {
+pub trait Time: Sub<Duration, Output = Self> {
 	/// Returns an instance corresponding to the current moment.
 	fn now() -> Self;
 
 	/// Returns the amount of time elapsed since created.
 	fn elapsed(&self) -> Duration;
 }
 
-impl<T: Time + Sub<Duration, Output = T>> ScorerUsingTime<T> {
+impl<T: Time> ScorerUsingTime<T> {
 	/// Creates a new scorer using the given scoring parameters.
 	pub fn new(params: ScoringParameters) -> Self {
 		Self {
@@ -153,7 +153,7 @@ impl<T: Time + Sub<Duration, Output = T>> ScorerUsingTime<T> {
 	}
 }
 
-impl<T: Time + Sub<Duration, Output = T>> ChannelFailure<T> {
+impl<T: Time> ChannelFailure<T> {
 	fn new(failure_penalty_msat: u64) -> Self {
 		Self {
 			undecayed_penalty_msat: failure_penalty_msat,
@@ -175,7 +175,7 @@ impl<T: Time + Sub<Duration, Output = T>> ChannelFailure<T> {
 	}
 }
 
-impl<T: Time + Sub<Duration, Output = T>> Default for ScorerUsingTime<T> {
+impl<T: Time> Default for ScorerUsingTime<T> {
 	fn default() -> Self {
 		Self::new(ScoringParameters::default())
 	}
@@ -191,7 +191,7 @@ impl Default for ScoringParameters {
 	}
 }
 
-impl<T: Time + Sub<Duration, Output = T>> routing::Score for ScorerUsingTime<T> {
+impl<T: Time> routing::Score for ScorerUsingTime<T> {
 	fn channel_penalty_msat(
 		&self, short_channel_id: u64, _source: &NodeId, _target: &NodeId
 	) -> u64 {
@@ -244,15 +244,15 @@ impl Sub<Duration> for Eternity {
 	}
 }
 
-impl<T: Time + Sub<Duration, Output = T>> Writeable for ScorerUsingTime<T> {
+impl<T: Time> Writeable for ScorerUsingTime<T> {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		self.params.write(w)?;
 		self.channel_failures.write(w)
 	}
 }
 
-impl<T: Time + Sub<Duration, Output = T>> Readable for ScorerUsingTime<T> {
+impl<T: Time> Readable for ScorerUsingTime<T> {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {
@@ -262,15 +262,15 @@ impl<T: Time + Sub<Duration, Output = T>> Readable for ScorerUsingTime<T> {
 	}
 }
 
-impl<T: Time + Sub<Duration, Output = T>> Writeable for ChannelFailure<T> {
+impl<T: Time> Writeable for ChannelFailure<T> {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		self.undecayed_penalty_msat.write(w)?;
 		(duration_since_epoch() - self.last_failed.elapsed()).write(w)
 	}
 }
 
-impl<T: Time + Sub<Duration, Output = T>> Readable for ChannelFailure<T> {
+impl<T: Time> Readable for ChannelFailure<T> {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {