fix sweeper kvstore sync

Author: joostjager

lightning-background-processor/src/lib.rs

@@ -997,9 +997,7 @@ impl BackgroundProcessor {
 		D: 'static + Deref,
 		O: 'static + Deref,
 		K: 'static + Deref,
-		OS: 'static
-			+ Deref<Target = OutputSweeperSync<T, D, F, CF, Arc<KVStoreSyncWrapper<K>>, L, O>>
-			+ Send,
+		OS: 'static + Deref<Target = OutputSweeperSync<T, D, F, CF, K, L, O>> + Send,
 		FS: FutureSpawner,
 	>(
 		persister: PS, event_handler: EH, chain_monitor: M, channel_manager: CM,

lightning/src/util/persist.rs

@@ -215,7 +215,7 @@ pub trait KVStoreSync {
 }
 
 /// A wrapper around a [`KVStoreSync`] that implements the [`KVStore`] trait.
-pub struct KVStoreSyncWrapper<K: Deref>(Arc<K>)
+pub struct KVStoreSyncWrapper<K: Deref>(K)
 where
 	K::Target: KVStoreSync;
 
@@ -224,7 +224,7 @@ where
 	K::Target: KVStoreSync,
 {
 	/// Constructs a new [`KVStoreSyncWrapper`].
-	pub fn new(kv_store: Arc<K>) -> Self {
+	pub fn new(kv_store: K) -> Self {
 		Self(kv_store)
 	}
 }

lightning/src/util/sweep.rs

@@ -23,8 +23,8 @@ use crate::sync::Arc;
 use crate::sync::Mutex;
 use crate::util::logger::Logger;
 use crate::util::persist::{
-	KVStore, OUTPUT_SWEEPER_PERSISTENCE_KEY, OUTPUT_SWEEPER_PERSISTENCE_PRIMARY_NAMESPACE,
-	OUTPUT_SWEEPER_PERSISTENCE_SECONDARY_NAMESPACE,
+	KVStore, KVStoreSync, KVStoreSyncWrapper, OUTPUT_SWEEPER_PERSISTENCE_KEY,
+	OUTPUT_SWEEPER_PERSISTENCE_PRIMARY_NAMESPACE, OUTPUT_SWEEPER_PERSISTENCE_SECONDARY_NAMESPACE,
 };
 use crate::util::ser::{Readable, ReadableArgs, Writeable};
 use crate::{impl_writeable_tlv_based, log_debug, log_error};
@@ -916,11 +916,21 @@ where
 	D::Target: ChangeDestinationSourceSync,
 	E::Target: FeeEstimator,
 	F::Target: Filter,
-	K::Target: KVStore,
+	K::Target: KVStoreSync,
 	L::Target: Logger,
 	O::Target: OutputSpender,
 {
-	sweeper: Arc<OutputSweeper<B, Arc<ChangeDestinationSourceSyncWrapper<D>>, E, F, K, L, O>>,
+	sweeper: Arc<
+		OutputSweeper<
+			B,
+			Arc<ChangeDestinationSourceSyncWrapper<D>>,
+			E,
+			F,
+			Arc<KVStoreSyncWrapper<K>>,
+			L,
+			O,
+		>,
+	>,
 }
 
 impl<B: Deref, D: Deref, E: Deref, F: Deref, K: Deref, L: Deref, O: Deref>
@@ -930,7 +940,7 @@ where
 	D::Target: ChangeDestinationSourceSync,
 	E::Target: FeeEstimator,
 	F::Target: Filter,
-	K::Target: KVStore,
+	K::Target: KVStoreSync,
 	L::Target: Logger,
 	O::Target: OutputSpender,
 {
@@ -942,6 +952,8 @@ where
 		let change_destination_source =
 			Arc::new(ChangeDestinationSourceSyncWrapper::new(change_destination_source));
 
+		let kv_store = Arc::new(KVStoreSyncWrapper::new(kv_store));
+
 		let sweeper = OutputSweeper::new(
 			best_block,
 			broadcaster,
@@ -1006,7 +1018,7 @@ where
 	D::Target: ChangeDestinationSourceSync,
 	E::Target: FeeEstimator,
 	F::Target: Filter + Sync + Send,
-	K::Target: KVStore,
+	K::Target: KVStoreSync,
 	L::Target: Logger,
 	O::Target: OutputSpender,
 {