Move Payee::Blinded from a tuple to a struct enum variant

Author: valentinewallace

lightning/src/routing/router.rs

@@ -545,7 +545,7 @@ impl Writeable for PaymentParameters {
 		let mut blinded_hints = &vec![];
 		match &self.payee {
 			Payee::Clear { route_hints, .. } => clear_hints = route_hints,
-			Payee::Blinded(hints) => blinded_hints = hints,
+			Payee::Blinded { route_hints } => blinded_hints = route_hints,
 		}
 		write_tlv_fields!(writer, {
 			(0, self.payee.node_id(), option),
@@ -581,7 +581,7 @@ impl ReadableArgs<u32> for PaymentParameters {
 		let blinded_route_hints = blinded_route_hints.unwrap_or(vec![]);
 		let payee = if blinded_route_hints.len() != 0 {
 			if clear_route_hints.len() != 0 || payee_pubkey.is_some() { return Err(DecodeError::InvalidValue) }
-			Payee::Blinded(blinded_route_hints)
+			Payee::Blinded { route_hints: blinded_route_hints }
 		} else {
 			Payee::Clear {
 				route_hints: clear_route_hints,
@@ -633,7 +633,7 @@ impl PaymentParameters {
 	///
 	/// This is not exported to bindings users since bindings don't support move semantics
 	pub fn with_bolt11_features(self, features: InvoiceFeatures) -> Result<Self, ()> {
-		if let Payee::Blinded(_) = self.payee { return Err(()) }
+		if let Payee::Blinded { .. } = self.payee { return Err(()) }
 		Ok(Self { features: Some(features), ..self })
 	}
 
@@ -643,7 +643,7 @@ impl PaymentParameters {
 	/// This is not exported to bindings users since bindings don't support move semantics
 	pub fn with_route_hints(self, route_hints: Vec<RouteHint>) -> Result<Self, ()> {
 		match self.payee {
-			Payee::Blinded(_) => Err(()),
+			Payee::Blinded { .. } => Err(()),
 			Payee::Clear { node_id, .. } =>
 				Ok(Self { payee: Payee::Clear { route_hints, node_id }, ..self })
 		}
@@ -684,7 +684,11 @@ impl PaymentParameters {
 pub enum Payee {
 	/// The recipient provided blinded paths and payinfo to reach them. The blinded paths themselves
 	/// will be included in the final [`Route`].
-	Blinded(Vec<(BlindedPayInfo, BlindedPath)>),
+	Blinded {
+		/// Aggregated routing info and blinded paths, for routing to the payee without knowing their
+		/// node id.
+		route_hints: Vec<(BlindedPayInfo, BlindedPath)>,
+	},
 	/// The recipient included these route hints in their BOLT11 invoice.
 	Clear {
 		/// The node id of the payee.