f use struct for queries

Author: TheBlueMatt

lightning/src/onion_message/dns_resolution.rs

@@ -256,6 +256,14 @@ impl Readable for HumanReadableName {
 	}
 }
 
+#[cfg(feature = "dnssec")]
+struct PendingResolution {
+	start_height: u32,
+	context: DNSResolverContext,
+	name: HumanReadableName,
+	payment_id: PaymentId,
+}
+
 /// A stateful resolver which maps BIP 353 Human Readable Names to URIs and BOLT12 [`Offer`]s.
 ///
 /// It does not directly implement [`DNSResolverMessageHandler`] but implements all the core logic
@@ -266,8 +274,7 @@ impl Readable for HumanReadableName {
 /// blocks.
 #[cfg(feature = "dnssec")]
 pub struct OMNameResolver {
-	pending_resolves:
-		Mutex<HashMap<Name, Vec<(u32, DNSResolverContext, HumanReadableName, PaymentId)>>>,
+	pending_resolves: Mutex<HashMap<Name, Vec<PendingResolution>>>,
 	latest_block_time: AtomicUsize,
 	latest_block_height: AtomicUsize,
 }
@@ -292,15 +299,7 @@ impl OMNameResolver {
 		self.latest_block_height.store(height as usize, Ordering::Release);
 		let mut resolves = self.pending_resolves.lock().unwrap();
 		resolves.retain(|_, queries| {
-			queries.retain_mut(
-				|(res_height, _, _, _)| {
-					if *res_height < height - 1 {
-						false
-					} else {
-						true
-					}
-				},
-			);
+			queries.retain(|query| query.start_height >= height - 1);
 			!queries.is_empty()
 		});
 	}
@@ -323,9 +322,10 @@ impl OMNameResolver {
 		);
 		let name_query = dns_name.clone().map(|q| DNSSECQuery(q));
 		if let Ok(dns_name) = dns_name {
-			let height = self.latest_block_height.load(Ordering::Acquire);
+			let start_height = self.latest_block_height.load(Ordering::Acquire) as u32;
 			let mut pending_resolves = self.pending_resolves.lock().unwrap();
-			let resolution = (height as u32, random_context, name, payment_id);
+			let context = random_context;
+			let resolution = PendingResolution { start_height, context, name, payment_id };
 			pending_resolves.entry(dns_name).or_insert_with(Vec::new).push(resolution);
 		}
 		name_query
@@ -381,7 +381,7 @@ impl OMNameResolver {
 		let DNSSECProof { name: answer_name, proof } = msg;
 		let mut pending_resolves = self.pending_resolves.lock().unwrap();
 		if let hash_map::Entry::Occupied(entry) = pending_resolves.entry(answer_name) {
-			if !entry.get().iter().any(|query| query.1 == context) {
+			if !entry.get().iter().any(|query| query.context == context) {
 				// If we don't have any pending queries with the context included in the blinded
 				// path (implying someone sent us this response not using the blinded path we gave
 				// when making the query), return immediately to avoid the extra time for the proof
@@ -432,7 +432,7 @@ impl OMNameResolver {
 				match (candidate_records.next(), candidate_records.next()) {
 					(Some(txt), None) => {
 						let completed_requests =
-							requests.into_iter().map(|(_, _, id, name)| (id, name)).collect();
+							requests.into_iter().map(|r| (r.name, r.payment_id)).collect();
 						return Some((completed_requests, txt));
 					},
 					_ => {},