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

Author: jkczyz

lightning/src/routing/scorer.rs

@@ -79,7 +79,7 @@ pub type DefaultClock = AlwaysPresent;
 /// [`routing::Score`] implementation parameterized by a [`Clock`].
 ///
 /// See [`Scorer`] for details.
-pub struct ScorerUsingClock<C: Clock + Sub<Duration, Output = C>> {
+pub struct ScorerUsingClock<C: Clock> {
 	params: ScoringParameters,
 	channel_failures: HashMap<u64, ChannelFailure<C>>,
 }
@@ -109,7 +109,7 @@ impl_writeable_tlv_based!(ScoringParameters, {
 /// Accounting for penalties from channel failures.
 ///
 /// Penalties decay over time, though accumulated as more failures occur.
-struct ChannelFailure<C: Clock + Sub<Duration, Output = C>> {
+struct ChannelFailure<C: Clock> {
 	/// Accumulated penalty in msats for the channel as of `last_failed`.
 	undecayed_penalty_msat: u64,
 
@@ -118,15 +118,15 @@ struct ChannelFailure<C: Clock + Sub<Duration, Output = C>> {
 }
 
 /// A measurement of time.
-pub trait Clock {
+pub trait Clock: Sub<Duration, Output = Self> {
 	/// Returns an instance corresponding to "now".
 	fn now() -> Self;
 
 	/// Returns the amount of time elapsed since the clock was created.
 	fn elapsed(&self) -> Duration;
 }
 
-impl<C: Clock + Sub<Duration, Output = C>> ScorerUsingClock<C> {
+impl<C: Clock> ScorerUsingClock<C> {
 	/// Creates a new scorer using the given scoring parameters.
 	pub fn new(params: ScoringParameters) -> Self {
 		Self {
@@ -146,7 +146,7 @@ impl<C: Clock + Sub<Duration, Output = C>> ScorerUsingClock<C> {
 	}
 }
 
-impl<C: Clock + Sub<Duration, Output = C>> ChannelFailure<C> {
+impl<C: Clock> ChannelFailure<C> {
 	fn new(failure_penalty_msat: u64) -> Self {
 		Self {
 			undecayed_penalty_msat: failure_penalty_msat,
@@ -168,7 +168,7 @@ impl<C: Clock + Sub<Duration, Output = C>> ChannelFailure<C> {
 	}
 }
 
-impl<C: Clock + Sub<Duration, Output = C>> Default for ScorerUsingClock<C> {
+impl<C: Clock> Default for ScorerUsingClock<C> {
 	fn default() -> Self {
 		Self::new(ScoringParameters::default())
 	}
@@ -184,7 +184,7 @@ impl Default for ScoringParameters {
 	}
 }
 
-impl<C: Clock + Sub<Duration, Output = C>> routing::Score for ScorerUsingClock<C> {
+impl<C: Clock> routing::Score for ScorerUsingClock<C> {
 	fn channel_penalty_msat(
 		&self, short_channel_id: u64, _source: &NodeId, _target: &NodeId
 	) -> u64 {
@@ -237,15 +237,15 @@ impl Sub<Duration> for AlwaysPresent {
 	}
 }
 
-impl<C: Clock + Sub<Duration, Output = C>> Writeable for ScorerUsingClock<C> {
+impl<C: Clock> Writeable for ScorerUsingClock<C> {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 		self.params.write(w)?;
 		self.channel_failures.write(w)
 	}
 }
 
-impl<C: Clock + Sub<Duration, Output = C>> Readable for ScorerUsingClock<C> {
+impl<C: Clock> Readable for ScorerUsingClock<C> {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {
@@ -255,15 +255,15 @@ impl<C: Clock + Sub<Duration, Output = C>> Readable for ScorerUsingClock<C> {
 	}
 }
 
-impl<C: Clock + Sub<Duration, Output = C>> Writeable for ChannelFailure<C> {
+impl<C: Clock> Writeable for ChannelFailure<C> {
 	#[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<C: Clock + Sub<Duration, Output = C>> Readable for ChannelFailure<C> {
+impl<C: Clock> Readable for ChannelFailure<C> {
 	#[inline]
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {