Remove redundant Arc wrapping of HRNResolver

Streamlines the storage and passing of HRNResolver by holding it by
value in the Node and UnifiedPayment structs.

Changes:
- Removed the outer Arc wrapper around HRNResolver in Node and
  UnifiedPayment.
- Implemented Clone for HRNResolver to facilitate easy sharing of
  the internal Arcs.
- Updated UnifiedPayment method calls to pass HRNResolver by
  reference instead of using .as_ref() on an outer Arc.

Since HRNResolver variants already contain internal Arcs, the outer
Arc was redundant and added unnecessary memory indirection.

Author: chuksys

src/builder.rs

@@ -2051,7 +2051,7 @@ fn build_with_store_internal(
 		node_metrics,
 		om_mailbox,
 		async_payments_role,
-		hrn_resolver: Arc::new(hrn_resolver),
+		hrn_resolver,
 		#[cfg(cycle_tests)]
 		_leak_checker,
 	})

src/lib.rs

@@ -238,7 +238,7 @@ pub struct Node {
 	node_metrics: Arc<RwLock<NodeMetrics>>,
 	om_mailbox: Option<Arc<OnionMessageMailbox>>,
 	async_payments_role: Option<AsyncPaymentsRole>,
-	hrn_resolver: Arc<HRNResolver>,
+	hrn_resolver: HRNResolver,
 	#[cfg(cycle_tests)]
 	_leak_checker: LeakChecker,
 }
@@ -1006,7 +1006,7 @@ impl Node {
 			self.bolt12_payment().into(),
 			Arc::clone(&self.config),
 			Arc::clone(&self.logger),
-			Arc::clone(&self.hrn_resolver),
+			self.hrn_resolver.clone(),
 		)
 	}
 

src/payment/unified.rs

@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
 	bolt12_payment: Arc<Bolt12Payment>,
 	config: Arc<Config>,
 	logger: Arc<Logger>,
-	hrn_resolver: Arc<HRNResolver>,
+	hrn_resolver: HRNResolver,
 	#[cfg(hrn_tests)]
 	test_offer: std::sync::Mutex<Option<Offer>>,
 }
@@ -83,7 +83,7 @@ impl UnifiedPayment {
 	pub(crate) fn new(
 		onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 		bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
-		hrn_resolver: Arc<HRNResolver>,
+		hrn_resolver: HRNResolver,
 	) -> Self {
 		Self {
 			onchain_payment,
@@ -197,7 +197,7 @@ impl UnifiedPayment {
 		}
 
 		let parse_fut =
-			PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
+			PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);
 
 		let instructions =
 			tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
@@ -223,7 +223,7 @@ impl UnifiedPayment {
 					Error::InvalidAmount
 				})?;
 
-				let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
+				let fut = instr.set_amount(amt, &self.hrn_resolver);
 
 				tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 					.await

src/types.rs

@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
 	IgnoringMessageHandler,
 >;
 
+#[derive(Clone)]
 pub enum HRNResolver {
 	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
 	Local(Arc<DNSHrnResolver>),