SIS sep file

Author: joostjager

src/event.rs

@@ -5,6 +5,7 @@
 // http://opensource.org/licenses/MIT>, at your option. You may not use this file except in
 // accordance with one or both of these licenses.
 
+use crate::static_invoice_store::StaticInvoiceStore;
 use crate::types::{CustomTlvRecord, DynStore, PaymentStore, Sweeper, Wallet};
 
 use crate::{
@@ -37,8 +38,6 @@ use lightning::events::{Event as LdkEvent, PaymentFailureReason};
 use lightning::impl_writeable_tlv_based_enum;
 use lightning::ln::channelmanager::PaymentId;
 use lightning::ln::types::ChannelId;
-use lightning::offers::static_invoice::StaticInvoice;
-use lightning::onion_message::messenger::Responder;
 use lightning::routing::gossip::NodeId;
 use lightning::util::config::{
 	ChannelConfigOverrides, ChannelConfigUpdate, ChannelHandshakeConfigUpdate,
@@ -58,7 +57,7 @@ use rand::{thread_rng, Rng};
 
 use core::future::Future;
 use core::task::{Poll, Waker};
-use std::collections::{HashMap, VecDeque};
+use std::collections::VecDeque;
 use std::ops::Deref;
 use std::sync::{Arc, Condvar, Mutex};
 
@@ -463,31 +462,6 @@ where
 	static_invoice_store: StaticInvoiceStore,
 }
 
-struct StaticInvoiceStore {
-	pub static_invoices: Mutex<HashMap<(Vec<u8>, u16), StaticInvoice>>,
-}
-
-impl StaticInvoiceStore {
-	fn new() -> Self {
-		Self { static_invoices: Mutex::new(HashMap::new()) }
-	}
-
-	fn handle_static_invoice_requested(
-		&self, recipient_id: Vec<u8>, invoice_slot: u16,
-	) -> Option<StaticInvoice> {
-		let map = self.static_invoices.lock().unwrap();
-
-		map.get(&(recipient_id.clone(), invoice_slot)).cloned()
-	}
-
-	fn handle_persist_static_invoice(
-		&self, invoice: StaticInvoice, invoice_slot: u16, recipient_id: Vec<u8>,
-	) {
-		let mut map = self.static_invoices.lock().unwrap();
-		map.insert((recipient_id, invoice_slot), invoice);
-	}
-}
-
 impl<L: Deref + Clone + Sync + Send + 'static> EventHandler<L>
 where
 	L::Target: LdkLogger,
@@ -498,8 +472,9 @@ where
 		channel_manager: Arc<ChannelManager>, connection_manager: Arc<ConnectionManager<L>>,
 		output_sweeper: Arc<Sweeper>, network_graph: Arc<Graph>,
 		liquidity_source: Option<Arc<LiquiditySource<Arc<Logger>>>>,
-		payment_store: Arc<PaymentStore>, peer_store: Arc<PeerStore<L>>, runtime: Arc<Runtime>,
-		logger: L, config: Arc<Config>,
+		payment_store: Arc<PaymentStore>, peer_store: Arc<PeerStore<L>>,
+		static_invoice_store: StaticInvoiceStore, runtime: Arc<Runtime>, logger: L,
+		config: Arc<Config>,
 	) -> Self {
 		Self {
 			event_queue,
@@ -515,7 +490,7 @@ where
 			logger,
 			runtime,
 			config,
-			static_invoice_store: StaticInvoiceStore::new(),
+			static_invoice_store,
 		}
 	}
 
@@ -1530,18 +1505,17 @@ where
 				recipient_id,
 				invoice_persisted_path,
 			} => {
-				self.static_invoice_store.handle_persist_static_invoice(
-					invoice,
-					invoice_slot,
-					recipient_id,
-				);
+				self.static_invoice_store
+					.handle_persist_static_invoice(invoice, invoice_slot, recipient_id)
+					.await;
 
 				self.channel_manager.static_invoice_persisted(invoice_persisted_path);
 			},
 			LdkEvent::StaticInvoiceRequested { recipient_id, invoice_slot, reply_path } => {
 				let invoice = self
 					.static_invoice_store
-					.handle_static_invoice_requested(recipient_id, invoice_slot);
+					.handle_static_invoice_requested(recipient_id, invoice_slot)
+					.await;
 
 				if let Some(invoice) = invoice {
 					match self.channel_manager.send_static_invoice(invoice, reply_path) {

src/lib.rs

@@ -95,6 +95,7 @@ mod message_handler;
 pub mod payment;
 mod peer_store;
 mod runtime;
+mod static_invoice_store;
 mod tx_broadcaster;
 mod types;
 mod wallet;
@@ -171,6 +172,8 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
+use crate::static_invoice_store::StaticInvoiceStore;
+
 #[cfg(feature = "uniffi")]
 uniffi::include_scaffolding!("ldk_node");
 
@@ -498,6 +501,8 @@ impl Node {
 			Arc::clone(&self.logger),
 		));
 
+		let static_invoice_store = StaticInvoiceStore::new();
+
 		let event_handler = Arc::new(EventHandler::new(
 			Arc::clone(&self.event_queue),
 			Arc::clone(&self.wallet),
@@ -509,6 +514,7 @@ impl Node {
 			self.liquidity_source.clone(),
 			Arc::clone(&self.payment_store),
 			Arc::clone(&self.peer_store),
+			static_invoice_store,
 			Arc::clone(&self.runtime),
 			Arc::clone(&self.logger),
 			Arc::clone(&self.config),

src/static_invoice_store.rs

@@ -0,0 +1,28 @@
+use std::{collections::HashMap, sync::Mutex};
+
+use lightning::offers::static_invoice::StaticInvoice;
+
+pub(crate) struct StaticInvoiceStore {
+	pub static_invoices: Mutex<HashMap<(Vec<u8>, u16), StaticInvoice>>,
+}
+
+impl StaticInvoiceStore {
+	pub(crate) fn new() -> Self {
+		Self { static_invoices: Mutex::new(HashMap::new()) }
+	}
+
+	pub(crate) async fn handle_static_invoice_requested(
+		&self, recipient_id: Vec<u8>, invoice_slot: u16,
+	) -> Option<StaticInvoice> {
+		let map = self.static_invoices.lock().unwrap();
+
+		map.get(&(recipient_id.clone(), invoice_slot)).cloned()
+	}
+
+	pub(crate) async fn handle_persist_static_invoice(
+		&self, invoice: StaticInvoice, invoice_slot: u16, recipient_id: Vec<u8>,
+	) {
+		let mut map = self.static_invoices.lock().unwrap();
+		map.insert((recipient_id, invoice_slot), invoice);
+	}
+}