mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3260 from TheBlueMatt/2024-08-more-deref

Browse source 
Bound `Persister`'s `WriteableScore` by `Deref`
This commit is contained in:
Matt Corallo 2024-08-21 19:55:44 +00:00 • committed by GitHub
commit 7cf4a1995d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lightning-background-processor/src/lib.rs
View file

@ -764,7 +764,7 @@ where
F::Target: 'static + FeeEstimator, F::Target: 'static + FeeEstimator,
L::Target: 'static + Logger, L::Target: 'static + Logger,
P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>, P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
PS::Target: 'static + Persister<'a, CM, L, SC>, PS::Target: 'static + Persister<'a, CM, L, S>,
CM::Target: AChannelManager + Send + Sync, CM::Target: AChannelManager + Send + Sync,
OM::Target: AOnionMessenger + Send + Sync, OM::Target: AOnionMessenger + Send + Sync,
PM::Target: APeerManager + Send + Sync, PM::Target: APeerManager + Send + Sync,
@ -786,7 +786,7 @@ where
if let Some(duration_since_epoch) = fetch_time() { if let Some(duration_since_epoch) = fetch_time() {
if update_scorer(scorer, &event, duration_since_epoch) { if update_scorer(scorer, &event, duration_since_epoch) {
log_trace!(logger, "Persisting scorer after update"); log_trace!(logger, "Persisting scorer after update");
if let Err(e) = persister.persist_scorer(&scorer) { if let Err(e) = persister.persist_scorer(&*scorer) {
log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e); log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e);
// We opt not to abort early on persistence failure here as persisting // We opt not to abort early on persistence failure here as persisting
// the scorer is non-critical and we still hope that it will have // the scorer is non-critical and we still hope that it will have
@ -935,7 +935,7 @@ impl BackgroundProcessor {
F::Target: 'static + FeeEstimator, F::Target: 'static + FeeEstimator,
L::Target: 'static + Logger, L::Target: 'static + Logger,
P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>, P::Target: 'static + Persist<<CM::Target as AChannelManager>::Signer>,
PS::Target: 'static + Persister<'a, CM, L, SC>, PS::Target: 'static + Persister<'a, CM, L, S>,
CM::Target: AChannelManager + Send + Sync, CM::Target: AChannelManager + Send + Sync,
OM::Target: AOnionMessenger + Send + Sync, OM::Target: AOnionMessenger + Send + Sync,
PM::Target: APeerManager + Send + Sync, PM::Target: APeerManager + Send + Sync,

6
lightning/src/util/persist.rs
View file

@ -157,10 +157,11 @@ pub trait KVStore {
/// Trait that handles persisting a [`ChannelManager`], [`NetworkGraph`], and [`WriteableScore`] to disk. /// Trait that handles persisting a [`ChannelManager`], [`NetworkGraph`], and [`WriteableScore`] to disk.
/// ///
/// [`ChannelManager`]: crate::ln::channelmanager::ChannelManager /// [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
pub trait Persister<'a, CM: Deref, L: Deref, S: WriteableScore<'a>> pub trait Persister<'a, CM: Deref, L: Deref, S: Deref>
where where
CM::Target: 'static + AChannelManager, CM::Target: 'static + AChannelManager,
L::Target: 'static + Logger, L::Target: 'static + Logger,
S::Target: WriteableScore<'a>,
{ {
/// Persist the given ['ChannelManager'] to disk, returning an error if persistence failed. /// Persist the given ['ChannelManager'] to disk, returning an error if persistence failed.
/// ///
@ -175,10 +176,11 @@ where
} }
impl<'a, A: KVStore + ?Sized, CM: Deref, L: Deref, S: WriteableScore<'a>> Persister<'a, CM, L, S> for A impl<'a, A: KVStore + ?Sized, CM: Deref, L: Deref, S: Deref> Persister<'a, CM, L, S> for A
where where
CM::Target: 'static + AChannelManager, CM::Target: 'static + AChannelManager,
L::Target: 'static + Logger, L::Target: 'static + Logger,
S::Target: WriteableScore<'a>,
{ {
fn persist_manager(&self, channel_manager: &CM) -> Result<(), io::Error> { fn persist_manager(&self, channel_manager: &CM) -> Result<(), io::Error> {
self.write(CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE, self.write(CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,