fixup! Pass HRNResolver or DomainResolver into OnionMessenger

Author: chuksys

src/builder.rs

@@ -25,6 +25,7 @@ use lightning::chain::{chainmonitor, BestBlock};
 use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
 use lightning::ln::msgs::{RoutingMessageHandler, SocketAddress};
 use lightning::ln::peer_handler::{IgnoringMessageHandler, MessageHandler};
+use lightning::log_trace;
 use lightning::onion_message::dns_resolution::DNSResolverMessageHandler;
 use lightning::routing::gossip::NodeAlias;
 use lightning::routing::router::DefaultRouter;
@@ -40,7 +41,6 @@ use lightning::util::persist::{
 };
 use lightning::util::ser::ReadableArgs;
 use lightning::util::sweep::OutputSweeper;
-use lightning::{log_trace, log_warn};
 use lightning_dns_resolver::OMDomainResolver;
 use lightning_persister::fs_store::v1::FilesystemStore;
 use vss_client::headers::VssHeaderProvider;
@@ -172,6 +172,8 @@ pub enum BuildError {
 	InvalidTorProxyAddress,
 	/// The provided alias is invalid.
 	InvalidNodeAlias,
+	/// The provided configuration is invalid.
+	InvalidConfiguration(&'static str),
 	/// An attempt to setup a runtime has failed.
 	RuntimeSetupFailed,
 	/// We failed to read data from the [`KVStore`].
@@ -216,6 +218,7 @@ impl fmt::Display for BuildError {
 				write!(f, "Given announcement addresses are invalid.")
 			},
 			Self::InvalidTorProxyAddress => write!(f, "Given Tor proxy address is invalid."),
+			Self::InvalidConfiguration(msg) => write!(f, "Given configuration is invalid: {}", msg),
 			Self::RuntimeSetupFailed => write!(f, "Failed to setup a runtime."),
 			Self::ReadFailed => write!(f, "Failed to read from store."),
 			Self::WriteFailed => write!(f, "Failed to write to store."),
@@ -1772,34 +1775,29 @@ fn build_with_store_internal(
 				BuildError::DNSResolverSetupFailed
 			})?;
 
-			if *enable_hrn_resolution_service && may_announce_channel(&config).is_ok() {
-				let hrn_res = Arc::new(DNSHrnResolver(addr));
-				hrn_resolver = HRNResolver::Local(hrn_res);
+			let hrn_res = Arc::new(DNSHrnResolver(addr));
+			hrn_resolver = HRNResolver::Local(hrn_res);
+
+			if *enable_hrn_resolution_service {
+				if let Err(_) = may_announce_channel(&config) {
+					log_error!(
+						logger,
+						"HRN resolution service enabled, but node is not announceable."
+					);
+					return Err(BuildError::InvalidConfiguration(
+						"Node must announce channels to act as a resolver service.",
+					));
+				}
 
 				Arc::new(OMDomainResolver::<IgnoringMessageHandler>::with_runtime(
 					addr,
 					None,
 					Some(runtime_handle.clone()),
 				)) as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 			} else {
-				if *enable_hrn_resolution_service {
-					log_warn!(logger, "Unable to act as an HRN resolution service. To act as an HRN resolution service, the node must be configured to announce channels.");
-				}
-
-				// Fallback/Default: Onion resolver
-				let hrn_res =
-					Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
-				hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
-
-				let pm_hook_clone = Arc::clone(&peer_manager_hook);
-				hrn_res.register_post_queue_action(Box::new(move || {
-					if let Ok(guard) = pm_hook_clone.lock() {
-						if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
-							pm.process_events();
-						}
-					}
-				}));
-				hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
+				// The user wants to use DNS to pay others, but NOT provide a service to others.
+				Arc::new(IgnoringMessageHandler {})
+					as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 			}
 		},
 	};