Skip to content

Commit 3b7859f

Browse files
Merge pull request #1734 from TheBlueMatt/2022-09-better-lock-name
Rename `MultiThreadedLockableScoreLock` `MultiThreadedScoreLock`
2 parents 5211bfd + ba021f8 commit 3b7859f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lightning/src/routing/scoring.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ pub struct MultiThreadedLockableScore<S: Score> {
189189
}
190190
#[cfg(c_bindings)]
191191
/// A locked `MultiThreadedLockableScore`.
192-
pub struct MultiThreadedLockableScoreLock<'a, S: Score>(MutexGuard<'a, S>);
192+
pub struct MultiThreadedScoreLock<'a, S: Score>(MutexGuard<'a, S>);
193193
#[cfg(c_bindings)]
194-
impl<'a, T: Score + 'a> Score for MultiThreadedLockableScoreLock<'a, T> {
194+
impl<'a, T: Score + 'a> Score for MultiThreadedScoreLock<'a, T> {
195195
fn channel_penalty_msat(&self, scid: u64, source: &NodeId, target: &NodeId, usage: ChannelUsage) -> u64 {
196196
self.0.channel_penalty_msat(scid, source, target, usage)
197197
}
@@ -209,18 +209,18 @@ impl<'a, T: Score + 'a> Score for MultiThreadedLockableScoreLock<'a, T> {
209209
}
210210
}
211211
#[cfg(c_bindings)]
212-
impl<'a, T: Score + 'a> Writeable for MultiThreadedLockableScoreLock<'a, T> {
212+
impl<'a, T: Score + 'a> Writeable for MultiThreadedScoreLock<'a, T> {
213213
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
214214
self.0.write(writer)
215215
}
216216
}
217217

218218
#[cfg(c_bindings)]
219219
impl<'a, T: Score + 'a> LockableScore<'a> for MultiThreadedLockableScore<T> {
220-
type Locked = MultiThreadedLockableScoreLock<'a, T>;
220+
type Locked = MultiThreadedScoreLock<'a, T>;
221221

222-
fn lock(&'a self) -> MultiThreadedLockableScoreLock<'a, T> {
223-
MultiThreadedLockableScoreLock(Mutex::lock(&self.score).unwrap())
222+
fn lock(&'a self) -> MultiThreadedScoreLock<'a, T> {
223+
MultiThreadedScoreLock(Mutex::lock(&self.score).unwrap())
224224
}
225225
}
226226

0 commit comments

Comments
 (0)