f - Semantic checks without wrapped OfferTlvStream

Author: jkczyz

lightning/src/offers/mod.rs

@@ -241,47 +241,59 @@ impl TryFrom<OfferTlvStream> for Offer {
 	type Error = SemanticError;
 
 	fn try_from(tlv_stream: OfferTlvStream) -> Result<Self, Self::Error> {
-		if tlv_stream.description.is_none() {
-			return Err(SemanticError::MissingDescription);
-		}
+		let OfferTlvStream {
+			chains, currency, amount, description, features, absolute_expiry, paths, issuer,
+			quantity_min, quantity_max, recurrence, node_id, send_invoice, refund_for, signature,
+		} = tlv_stream;
 
-		if tlv_stream.node_id.is_none() && tlv_stream.paths.is_none() {
-			return Err(SemanticError::MissingDestination);
-		}
-
-		if tlv_stream.node_id.is_some() && tlv_stream.paths.is_some() {
-			return Err(SemanticError::DuplicateDestination);
+		if description.is_none() {
+			return Err(SemanticError::MissingDescription);
 		}
 
-		if let Some(WithoutLength(ref paths)) = tlv_stream.paths {
-			if paths.is_empty() {
+		let destination = match (node_id, paths) {
+			(None, None) => return Err(SemanticError::MissingDestination),
+			(Some(_), Some(_)) => return Err(SemanticError::DuplicateDestination),
+			(Some(node_id), None) => Destination::NodeId(node_id),
+			(None, Some(WithoutLength(paths))) if paths.is_empty() => {
 				return Err(SemanticError::MissingPaths);
-			}
-		}
+			},
+			(None, Some(WithoutLength(paths))) => Destination::Paths(paths),
+		};
 
-		if let Some(HighZeroBytesDroppedVarInt(quantity_min)) = tlv_stream.quantity_min {
+		if let Some(HighZeroBytesDroppedVarInt(quantity_min)) = quantity_min {
 			if quantity_min < 1 {
 				return Err(SemanticError::InvalidQuantity);
 			}
 
-			if let Some(HighZeroBytesDroppedVarInt(quantity_max)) = tlv_stream.quantity_max {
+			if let Some(HighZeroBytesDroppedVarInt(quantity_max)) = quantity_max {
 				if quantity_min > quantity_max {
 					return Err(SemanticError::InvalidQuantity);
 				}
 			}
 		}
 
-		if let Some(HighZeroBytesDroppedVarInt(quantity_max)) = tlv_stream.quantity_max {
+		if let Some(HighZeroBytesDroppedVarInt(quantity_max)) = quantity_max {
 			if quantity_max < 1 {
 				return Err(SemanticError::InvalidQuantity);
 			}
 		}
 
-		if tlv_stream.refund_for.is_some() && tlv_stream.send_invoice.is_none() {
+		if refund_for.is_some() && send_invoice.is_none() {
 			return Err(SemanticError::UnexpectedRefund);
 		}
 
-		Ok(Offer { tlv_stream })
+
+		Ok(Offer {
+			description: description.unwrap().0,
+			features,
+			absolute_expiry:
+				absolute_expiry.map(|seconds_from_epoch| Duration::from_secs(seconds_from_epoch.0)),
+			issuer: issuer.map(|issuer| issuer.0),
+			destination,
+			quantity_min: quantity_min.map(|quantity_min| quantity_min.0),
+			quantity_max: quantity_max.map(|quantity_max| quantity_max.0),
+			signature,
+		})
 	}
 }