f - remove Option from some Offer method return values

Author: jkczyz

lightning/src/offers/offer.rs

@@ -85,9 +85,9 @@ impl OfferBuilder {
 	/// Use a different pubkey per offer to avoid correlating offers.
 	pub fn new(description: String, signing_pubkey: PublicKey) -> Self {
 		let offer = OfferContents {
-			chains: None, metadata: None, amount: None, description, features: None,
-			absolute_expiry: None, issuer: None, paths: None, quantity_min: None,
-			quantity_max: None, signing_pubkey: Some(signing_pubkey),
+			chains: None, metadata: None, amount: None, description,
+			features: OfferFeatures::empty(), absolute_expiry: None, issuer: None, paths: None,
+			quantity_min: None, quantity_max: None, signing_pubkey: Some(signing_pubkey),
 		};
 		OfferBuilder { offer }
 	}
@@ -127,7 +127,7 @@ impl OfferBuilder {
 	/// Successive calls to this method will override the previous setting.
 	#[cfg(test)]
 	pub fn features(mut self, features: OfferFeatures) -> Self {
-		self.offer.features = Some(features);
+		self.offer.features = features;
 		self
 	}
 
@@ -350,13 +350,17 @@ impl OfferContents {
 			),
 		};
 
+		let features = {
+			if self.features == OfferFeatures::empty() { None } else { Some(&self.features) }
+		};
+
 		OfferTlvStreamRef {
 			chains: self.chains.as_ref(),
 			metadata: self.metadata.as_ref(),
 			currency,
 			amount,
 			description: Some(&self.description),
-			features: self.features.as_ref(),
+			features,
 			absolute_expiry: self.absolute_expiry.map(|duration| duration.as_secs()),
 			paths: self.paths.as_ref(),
 			issuer: self.issuer.as_ref(),
@@ -443,11 +447,11 @@ mod tests {
 		assert_eq!(offer.metadata(), None);
 		assert_eq!(offer.amount(), None);
 		assert_eq!(offer.description(), "foo");
-		assert_eq!(offer.features(), None);
+		assert_eq!(offer.features(), &OfferFeatures::empty());
 		assert_eq!(offer.absolute_expiry(), None);
 		#[cfg(feature = "std")]
 		assert!(!offer.is_expired());
-		assert_eq!(offer.paths(), None);
+		assert_eq!(offer.paths(), &[]);
 		assert_eq!(offer.issuer(), None);
 		assert_eq!(offer.quantity_min(), 1);
 		assert_eq!(offer.quantity_max(), 1);
@@ -553,19 +557,19 @@ mod tests {
 	#[test]
 	fn builds_offer_with_features() {
 		let offer = OfferBuilder::new("foo".into(), pubkey(42))
-			.features(OfferFeatures::empty())
+			.features(OfferFeatures::unknown())
 			.build()
 			.unwrap();
-		assert_eq!(offer.features(), Some(&OfferFeatures::empty()));
-		assert_eq!(offer.as_tlv_stream().features, Some(&OfferFeatures::empty()));
+		assert_eq!(offer.features(), &OfferFeatures::unknown());
+		assert_eq!(offer.as_tlv_stream().features, Some(&OfferFeatures::unknown()));
 
 		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.features(OfferFeatures::unknown())
 			.features(OfferFeatures::empty())
 			.build()
 			.unwrap();
-		assert_eq!(offer.features(), Some(&OfferFeatures::empty()));
-		assert_eq!(offer.as_tlv_stream().features, Some(&OfferFeatures::empty()));
+		assert_eq!(offer.features(), &OfferFeatures::empty());
+		assert_eq!(offer.as_tlv_stream().features, None);
 	}
 
 	#[test]
@@ -620,7 +624,7 @@ mod tests {
 			.build()
 			.unwrap();
 		let tlv_stream = offer.as_tlv_stream();
-		assert_eq!(offer.paths(), Some(&paths));
+		assert_eq!(offer.paths(), paths.as_slice());
 		assert_eq!(offer.signing_pubkey(), pubkey(42));
 		assert_ne!(pubkey(42), pubkey(44));
 		assert_eq!(tlv_stream.paths, Some(&paths));
@@ -633,15 +637,15 @@ mod tests {
 			.issuer("bar".into())
 			.build()
 			.unwrap();
-		assert_eq!(offer.issuer(), Some(&String::from("bar")));
+		assert_eq!(offer.issuer(), Some("bar"));
 		assert_eq!(offer.as_tlv_stream().issuer, Some(&String::from("bar")));
 
 		let offer = OfferBuilder::new("foo".into(), pubkey(42))
 			.issuer("bar".into())
 			.issuer("baz".into())
 			.build()
 			.unwrap();
-		assert_eq!(offer.issuer(), Some(&String::from("baz")));
+		assert_eq!(offer.issuer(), Some("baz"));
 		assert_eq!(offer.as_tlv_stream().issuer, Some(&String::from("baz")));
 	}