f accept a handle argument

Author: TheBlueMatt

lightning-dns-resolver/src/lib.rs

@@ -21,6 +21,8 @@ use lightning::onion_message::messenger::{
 	MessageSendInstructions, Responder, ResponseInstruction,
 };
 
+use tokio::runtime::Handle;
+
 #[cfg(not(any(target_pointer_width = "32", target_pointer_width = "64")))]
 const WE_REQUIRE_32_OR_64_BIT_USIZE: u8 = 424242;
 
@@ -32,6 +34,7 @@ where
 {
 	state: Arc<OMResolverState>,
 	proof_handler: Option<PH>,
+	runtime_handle: Handle,
 }
 
 const MAX_PENDING_RESPONSES: usize = 1024;
@@ -58,18 +61,36 @@ where
 	/// Creates a new [`OMDomainResolver`] given the [`SocketAddr`] of a DNS resolver listening on
 	/// TCP (e.g. 8.8.8.8:53, 1.1.1.1:53 or your local DNS resolver).
 	///
+	/// Uses `tokio`'s [`Handle::current`] to fetch the async runtime on which futures will be
+	/// spawned.
+	///
 	/// The optional `proof_handler` can be provided to pass proofs coming back to us to the
 	/// underlying handler. This is useful when this resolver is handling incoming resolution
 	/// requests but some other handler is making proof requests of remote nodes and wants to get
 	/// results.
 	pub fn new(resolver: SocketAddr, proof_handler: Option<PH>) -> Self {
+		Self::with_runtime(resolver, proof_handler, Handle::current())
+	}
+
+	/// Creates a new [`OMDomainResolver`] given the [`SocketAddr`] of a DNS resolver listening on
+	/// TCP (e.g. 8.8.8.8:53, 1.1.1.1:53 or your local DNS resolver) and a `tokio` runtime
+	/// [`Handle`] on which futures will be spawned.
+	///
+	/// The optional `proof_handler` can be provided to pass proofs coming back to us to the
+	/// underlying handler. This is useful when this resolver is handling incoming resolution
+	/// requests but some other handler is making proof requests of remote nodes and wants to get
+	/// results.
+	pub fn with_runtime(
+		resolver: SocketAddr, proof_handler: Option<PH>, runtime_handle: Handle,
+	) -> Self {
 		Self {
 			state: Arc::new(OMResolverState {
 				resolver,
 				pending_replies: Mutex::new(Vec::new()),
 				pending_query_count: AtomicUsize::new(0),
 			}),
 			proof_handler,
+			runtime_handle,
 		}
 	}
 }
@@ -96,7 +117,7 @@ where
 			return None;
 		}
 		let us = Arc::clone(&self.state);
-		tokio::spawn(async move {
+		self.runtime_handle.spawn(async move {
 			if let Ok((proof, _ttl)) = build_txt_proof_async(us.resolver, &q.0).await {
 				let contents = DNSResolverMessage::DNSSECProof(DNSSECProof { name: q.0, proof });
 				let instructions = responder.respond().into_instructions();