Have Wallet take EventQueue and ChannelManager refs

Author: tnull

src/builder.rs

@@ -792,12 +792,25 @@ fn build_with_store_internal(
 		},
 	};
 
+	let event_queue = match io::utils::read_event_queue(Arc::clone(&kv_store), Arc::clone(&logger))
+	{
+		Ok(event_queue) => Arc::new(event_queue),
+		Err(e) => {
+			if e.kind() == std::io::ErrorKind::NotFound {
+				Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
+			} else {
+				return Err(BuildError::ReadFailed);
+			}
+		},
+	};
+
 	let wallet = Arc::new(Wallet::new(
 		bdk_wallet,
 		wallet_persister,
 		Arc::clone(&tx_broadcaster),
 		Arc::clone(&fee_estimator),
 		Arc::clone(&payment_store),
+		Arc::clone(&event_queue),
 		Arc::clone(&logger),
 	));
 
@@ -1006,6 +1019,7 @@ fn build_with_store_internal(
 	};
 
 	let channel_manager = Arc::new(channel_manager);
+	wallet.set_channel_manager(Arc::clone(&channel_manager));
 
 	// Give ChannelMonitors to ChainMonitor
 	for (_blockhash, channel_monitor) in channel_monitors.into_iter() {
@@ -1187,18 +1201,6 @@ fn build_with_store_internal(
 		},
 	}
 
-	let event_queue = match io::utils::read_event_queue(Arc::clone(&kv_store), Arc::clone(&logger))
-	{
-		Ok(event_queue) => Arc::new(event_queue),
-		Err(e) => {
-			if e.kind() == std::io::ErrorKind::NotFound {
-				Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
-			} else {
-				return Err(BuildError::ReadFailed);
-			}
-		},
-	};
-
 	let peer_store = match io::utils::read_peer_info(Arc::clone(&kv_store), Arc::clone(&logger)) {
 		Ok(peer_store) => Arc::new(peer_store),
 		Err(e) => {

src/wallet/mod.rs

@@ -9,9 +9,11 @@ use persist::KVStoreWalletPersister;
 
 use crate::logger::{log_debug, log_error, log_info, log_trace, FilesystemLogger, Logger};
 
+use crate::event::EventQueue;
 use crate::fee_estimator::{ConfirmationTarget, FeeEstimator};
 use crate::payment::store::{ConfirmationStatus, PaymentStore};
 use crate::payment::{PaymentDetails, PaymentDirection, PaymentStatus};
+use crate::types::ChannelManager;
 use crate::Error;
 
 use lightning::chain::chaininterface::BroadcasterInterface;
@@ -68,9 +70,11 @@ where
 	// A BDK on-chain wallet.
 	inner: Mutex<PersistedWallet<KVStoreWalletPersister>>,
 	persister: Mutex<KVStoreWalletPersister>,
+	channel_manager: Mutex<Option<Arc<ChannelManager>>>,
 	broadcaster: B,
 	fee_estimator: E,
 	payment_store: Arc<PaymentStore<Arc<FilesystemLogger>>>,
+	event_queue: Arc<EventQueue<Arc<FilesystemLogger>>>,
 	logger: L,
 }
 
@@ -83,13 +87,27 @@ where
 	pub(crate) fn new(
 		wallet: bdk_wallet::PersistedWallet<KVStoreWalletPersister>,
 		wallet_persister: KVStoreWalletPersister, broadcaster: B, fee_estimator: E,
-		payment_store: Arc<PaymentStore<Arc<FilesystemLogger>>>, logger: L,
+		payment_store: Arc<PaymentStore<Arc<FilesystemLogger>>>,
+		event_queue: Arc<EventQueue<Arc<FilesystemLogger>>>, logger: L,
 	) -> Self {
 		let inner = Mutex::new(wallet);
 		let persister = Mutex::new(wallet_persister);
-		Self { inner, persister, broadcaster, fee_estimator, payment_store, logger }
+		let channel_manager = Mutex::new(None);
+		Self {
+			inner,
+			persister,
+			channel_manager,
+			broadcaster,
+			fee_estimator,
+			payment_store,
+			event_queue,
+			logger,
+		}
 	}
 
+	pub(crate) fn set_channel_manager(&self, channel_manager: Arc<ChannelManager>) {
+		*self.channel_manager.lock().unwrap() = Some(channel_manager);
+	}
 	pub(crate) fn get_full_scan_request(&self) -> FullScanRequest<KeychainKind> {
 		self.inner.lock().unwrap().start_full_scan().build()
 	}