f - remove Option from some Offer method return values

Author: jkczyz

lightning/src/offers/offer.rs

@@ -669,9 +669,10 @@ impl TryFrom<OfferTlvStream> for SendInvoiceOfferContents {
 			Some(description) => description,
 		};
 
-		if features.is_some() {
-			return Err(SemanticError::UnexpectedFeatures);
-		}
+		let features = match features {
+			None => OfferFeatures::empty(),
+			Some(_) => return Err(SemanticError::UnexpectedFeatures),
+		};
 
 		let absolute_expiry = absolute_expiry.map(Duration::from_secs);
 
@@ -685,8 +686,8 @@ impl TryFrom<OfferTlvStream> for SendInvoiceOfferContents {
 		}
 
 		Ok(SendInvoiceOfferContents(OfferContents {
-			chains: None, metadata, amount: None, description, features: None, absolute_expiry,
-			issuer, paths, quantity_min: None, quantity_max: None, signing_pubkey: None,
+			chains: None, metadata, amount: None, description, features, absolute_expiry, issuer,
+			paths, quantity_min: None, quantity_max: None, signing_pubkey: None,
 		}))
 	}
 }