f - Don't wrap OfferTlvStream

Author: jkczyz

lightning/src/offers/mod.rs

@@ -30,24 +30,31 @@ use std::time::SystemTime;
 ///
 #[derive(Debug)]
 pub struct Offer {
-	tlv_stream: OfferTlvStream,
+	description: String,
+	features: Option<OfferFeatures>,
+	absolute_expiry: Option<Duration>,
+	issuer: Option<String>,
+	destination: Destination,
+	quantity_min: Option<u64>,
+	quantity_max: Option<u64>,
+	signature: Option<Signature>,
+	// TODO: Add more fields
 }
 
 impl Offer {
 	///
 	pub fn description(&self) -> &String {
-		&self.tlv_stream.description.as_ref().unwrap().0
+		&self.description
 	}
 
 	///
 	pub fn features(&self) -> Option<&OfferFeatures> {
-		self.tlv_stream.features.as_ref()
+		self.features.as_ref()
 	}
 
 	///
 	pub fn absolute_expiry(&self) -> Option<Duration> {
-		self.tlv_stream.absolute_expiry.as_ref()
-			.map(|seconds_from_epoch| Duration::from_secs(seconds_from_epoch.0))
+		self.absolute_expiry
 	}
 
 	///
@@ -64,33 +71,24 @@ impl Offer {
 
 	///
 	pub fn issuer(&self) -> Option<&String> {
-		self.tlv_stream.issuer.as_ref().map(|issuer| &issuer.0)
+		self.issuer.as_ref()
 	}
 
 	///
-	pub fn destination(&self) -> Destination {
-		if let Some(ref node_id) = self.tlv_stream.node_id {
-			Destination::NodeId(node_id)
-		} else if let Some(ref paths) = self.tlv_stream.paths {
-			Destination::Paths(&paths.0)
-		} else {
-			unreachable!()
-		}
+	pub fn destination(&self) -> &Destination {
+		&self.destination
 	}
 
 	///
 	pub fn quantity_min(&self) -> u64 {
-		match self.tlv_stream.quantity_min {
-			Some(HighZeroBytesDroppedVarInt(quantity_min)) => quantity_min,
-			None => 1,
-		}
+		self.quantity_min.unwrap_or(1)
 	}
 
 	///
 	pub fn quantity_max(&self) -> u64 {
-		match self.tlv_stream.quantity_max {
-			Some(HighZeroBytesDroppedVarInt(quantity_max)) => quantity_max,
-			None => match self.tlv_stream.quantity_min {
+		match self.quantity_max {
+			Some(quantity_max) => quantity_max,
+			None => match self.quantity_min {
 				Some(_) => u64::max_value(),
 				None => 1,
 			},
@@ -99,16 +97,17 @@ impl Offer {
 
 	///
 	pub fn signature(&self) -> Option<&Signature> {
-		self.tlv_stream.signature.as_ref()
+		self.signature.as_ref()
 	}
 }
 
 ///
-pub enum Destination<'a> {
+#[derive(Debug)]
+pub enum Destination {
 	///
-	NodeId(&'a XOnlyPublicKey),
+	NodeId(XOnlyPublicKey),
 	///
-	Paths(&'a Vec<BlindedPath>),
+	Paths(Vec<BlindedPath>),
 }
 
 /// An `offer` TLV stream without any semantic checks, apart from any checks performed when parsing