From 35dda4e61ce3357f66e484ba33c408191707c824 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Tue, 18 Jul 2023 19:52:26 +0000 Subject: [PATCH] Drop `c_bindings` implementation of scoring on `Mutex`/`RefCell` This code was always effectively dead - we have a special `MultiThreadedLockableScore` type which wraps a `Mutex` for bindings users, so there's no need to implement any bindings-specific scoring logic for them. --- lightning/src/routing/scoring.rs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/lightning/src/routing/scoring.rs b/lightning/src/routing/scoring.rs index d83adaf97..615cc1a19 100644 --- a/lightning/src/routing/scoring.rs +++ b/lightning/src/routing/scoring.rs @@ -175,7 +175,7 @@ pub trait WriteableScore<'a>: LockableScore<'a> + Writeable {} #[cfg(not(c_bindings))] impl<'a, T> WriteableScore<'a> for T where T: LockableScore<'a> + Writeable {} -/// This is not exported to bindings users +#[cfg(not(c_bindings))] impl<'a, T: 'a + Score> LockableScore<'a> for Mutex { type Score = T; type Locked = MutexGuard<'a, T>; @@ -185,6 +185,7 @@ impl<'a, T: 'a + Score> LockableScore<'a> for Mutex { } } +#[cfg(not(c_bindings))] impl<'a, T: 'a + Score> LockableScore<'a> for RefCell { type Score = T; type Locked = RefMut<'a, T>; @@ -255,21 +256,7 @@ impl<'a, T: 'a + Score> Deref for MultiThreadedScoreLock<'a, T> { } } -#[cfg(c_bindings)] -/// This is not exported to bindings users -impl<'a, T: Writeable> Writeable for RefMut<'a, T> { - fn write(&self, writer: &mut W) -> Result<(), io::Error> { - T::write(&**self, writer) - } -} -#[cfg(c_bindings)] -/// This is not exported to bindings users -impl<'a, S: Writeable> Writeable for MutexGuard<'a, S> { - fn write(&self, writer: &mut W) -> Result<(), io::Error> { - S::write(&**self, writer) - } -} /// Proposed use of a channel passed as a parameter to [`Score::channel_penalty_msat`]. #[derive(Clone, Copy, Debug, PartialEq)] -- 2.39.5