f - remove Option from some Offer method return values

Author: jkczyz

lightning/src/offers/offer.rs

@@ -43,7 +43,7 @@ pub(crate) struct OfferContents {
 	metadata: Option<Vec<u8>>,
 	amount: Option<Amount>,
 	description: String,
-	features: Option<OfferFeatures>,
+	features: OfferFeatures,
 	absolute_expiry: Option<Duration>,
 	issuer: Option<String>,
 	paths: Option<Vec<BlindedPath>>,
@@ -73,13 +73,13 @@ impl Offer {
 	}
 
 	/// A complete description of the purpose of the payment.
-	pub fn description(&self) -> &String {
+	pub fn description(&self) -> &str {
 		&self.contents.description
 	}
 
 	/// Features for paying the invoice.
-	pub fn features(&self) -> Option<&OfferFeatures> {
-		self.contents.features.as_ref()
+	pub fn features(&self) -> &OfferFeatures {
+		&self.contents.features
 	}
 
 	/// Duration since the Unix epoch when an invoice should no longer be requested.
@@ -102,13 +102,13 @@ impl Offer {
 	}
 
 	/// The issuer of the offer, possibly beginning with `user@domain` or `domain`.
-	pub fn issuer(&self) -> Option<&String> {
-		self.contents.issuer.as_ref()
+	pub fn issuer(&self) -> Option<&str> {
+		self.contents.issuer.as_ref().map(|issuer| issuer.as_str())
 	}
 
 	/// Paths to the recipient originating from publicly reachable nodes.
-	pub fn paths(&self) -> Option<&Vec<BlindedPath>> {
-		self.contents.paths.as_ref()
+	pub fn paths(&self) -> &[BlindedPath] {
+		self.contents.paths.as_ref().map(|paths| paths.as_slice()).unwrap_or(&[])
 	}
 
 	/// The minimum quantity of items supported.