Rename LnNode to InvoiceHandler and move to lib

Author: AnthonyRonning

mutiny-core/src/lib.rs

@@ -87,8 +87,25 @@ use std::sync::Arc;
 use std::{collections::HashMap, sync::atomic::AtomicBool};
 use uuid::Uuid;
 
+#[cfg(test)]
+use mockall::{automock, predicate::*};
+
 const DEFAULT_PAYMENT_TIMEOUT: u64 = 30;
 
+#[cfg_attr(test, automock)]
+pub(crate) trait InvoiceHandler {
+    fn logger(&self) -> &MutinyLogger;
+    fn skip_hodl_invoices(&self) -> bool;
+    fn get_outbound_payment_status(&self, payment_hash: &[u8; 32]) -> Option<HTLCStatus>;
+    async fn pay_invoice_with_timeout(
+        &self,
+        invoice: &Bolt11Invoice,
+        amt_sats: Option<u64>,
+        timeout_secs: Option<u64>,
+        labels: Vec<String>,
+    ) -> Result<MutinyInvoice, MutinyError>;
+}
+
 #[derive(Copy, Clone)]
 pub struct MutinyBalance {
     pub confirmed: u64,

mutiny-core/src/node.rs

@@ -1,4 +1,3 @@
-use crate::ldkstorage::{persist_monitor, ChannelOpenParams};
 use crate::lsp::{InvoiceRequest, LspConfig};
 use crate::messagehandler::MutinyMessageHandler;
 use crate::nodemanager::ChannelClosure;
@@ -23,6 +22,10 @@ use crate::{
 use crate::{fees::P2WSH_OUTPUT_SIZE, peermanager::connect_peer_if_necessary};
 use crate::{keymanager::PhantomKeysManager, scorer::HubPreferentialScorer};
 use crate::{labels::LabelStorage, DEFAULT_PAYMENT_TIMEOUT};
+use crate::{
+    ldkstorage::{persist_monitor, ChannelOpenParams},
+    InvoiceHandler,
+};
 use anyhow::{anyhow, Context};
 use bdk::FeeRate;
 use bitcoin::hashes::{hex::ToHex, sha256::Hash as Sha256};
@@ -73,7 +76,7 @@ use lightning_liquidity::{
 };
 
 #[cfg(test)]
-use mockall::{automock, predicate::*};
+use mockall::predicate::*;
 use std::collections::HashMap;
 use std::{
     str::FromStr,
@@ -2054,21 +2057,7 @@ pub(crate) fn default_user_config() -> UserConfig {
     }
 }
 
-#[cfg_attr(test, automock)]
-pub(crate) trait LnNode {
-    fn logger(&self) -> &MutinyLogger;
-    fn skip_hodl_invoices(&self) -> bool;
-    fn get_outbound_payment_status(&self, payment_hash: &[u8; 32]) -> Option<HTLCStatus>;
-    async fn pay_invoice_with_timeout(
-        &self,
-        invoice: &Bolt11Invoice,
-        amt_sats: Option<u64>,
-        timeout_secs: Option<u64>,
-        labels: Vec<String>,
-    ) -> Result<MutinyInvoice, MutinyError>;
-}
-
-impl<S: MutinyStorage> LnNode for Node<S> {
+impl<S: MutinyStorage> InvoiceHandler for Node<S> {
     fn logger(&self) -> &MutinyLogger {
         self.logger.as_ref()
     }

mutiny-core/src/nostr/nwc.rs

@@ -1,10 +1,10 @@
 use crate::error::MutinyError;
 use crate::event::HTLCStatus;
-use crate::node::LnNode;
 use crate::nostr::nip49::NIP49Confirmation;
 use crate::nostr::NostrManager;
 use crate::storage::MutinyStorage;
 use crate::utils;
+use crate::InvoiceHandler;
 use anyhow::anyhow;
 use bitcoin::hashes::hex::{FromHex, ToHex};
 use bitcoin::secp256k1::{Secp256k1, Signing, ThirtyTwoByteHash};
@@ -309,7 +309,7 @@ impl NostrWalletConnect {
 
     pub(crate) async fn pay_nwc_invoice(
         &self,
-        node: &impl LnNode,
+        node: &impl InvoiceHandler,
         invoice: &Bolt11Invoice,
     ) -> Result<Response, MutinyError> {
         let label = self
@@ -398,7 +398,7 @@ impl NostrWalletConnect {
     pub async fn handle_nwc_request<S: MutinyStorage>(
         &mut self,
         event: Event,
-        node: &impl LnNode,
+        node: &impl InvoiceHandler,
         nostr_manager: &NostrManager<S>,
     ) -> anyhow::Result<Option<Event>> {
         let client_pubkey = self.client_key.public_key();
@@ -1102,11 +1102,11 @@ mod wasm_test {
     use super::*;
     use crate::event::{MillisatAmount, PaymentInfo};
     use crate::logging::MutinyLogger;
-    use crate::node::MockLnNode;
     use crate::nodemanager::MutinyInvoice;
     use crate::nostr::ProfileType;
     use crate::storage::MemoryStorage;
     use crate::test_utils::{create_dummy_invoice, create_node, create_nwc_request};
+    use crate::MockInvoiceHandler;
     use bitcoin::hashes::Hash;
     use bitcoin::secp256k1::ONE_KEY;
     use bitcoin::Network;
@@ -1454,7 +1454,7 @@ mod wasm_test {
     async fn test_process_nwc_event_budget() {
         let storage = MemoryStorage::default();
         let logger = Arc::new(MutinyLogger::default());
-        let mut node = MockLnNode::new();
+        let mut node = MockInvoiceHandler::new();
 
         let amount_msats = 5_000;