f - make signing_pubkey a non-Option again

Author: jkczyz

lightning/src/offers/offer.rs

@@ -125,11 +125,11 @@ impl OfferBuilder {
 	/// Use a different pubkey per offer to avoid correlating offers.
 	pub fn new(description: String, signing_pubkey: SigningPubkey) -> Self {
 		let (metadata_material, signing_pubkey) = match signing_pubkey {
-			SigningPubkey::Explicit(pubkey) => (None, Some(pubkey)),
+			SigningPubkey::Explicit(pubkey) => (None, pubkey),
 			SigningPubkey::Derived(expanded_key, nonce) => {
 				let metadata_material = (nonce, expanded_key.hmac_for_offer(nonce));
 				let signing_pubkey = expanded_key.signing_pubkey_for_offer(nonce);
-				(Some(metadata_material), Some(signing_pubkey))
+				(Some(metadata_material), signing_pubkey)
 			},
 		};
 		let offer = OfferContents {
@@ -159,9 +159,10 @@ impl OfferBuilder {
 	/// Sets the [`Offer::metadata`] to the given bytes.
 	///
 	/// Successive calls to this method will override the previous setting. Errors if the builder
-	/// was constructed with [`SigningPubkey::Derived`].
+	/// was constructed with [`SigningPubkey::Derived`] or if [`OfferBuilder::metadata_derived`] was
+	/// called.
 	pub fn metadata(mut self, metadata: Vec<u8>) -> Result<Self, SemanticError> {
-		if self.offer.signing_pubkey.is_none() {
+		if self.metadata_material.is_some() {
 			return Err(SemanticError::UnexpectedMetadata);
 		}
 
@@ -267,10 +268,6 @@ impl OfferBuilder {
 			self.offer.metadata = Some(metadata);
 		}
 
-		if self.offer.signing_pubkey.is_none() {
-			return Err(SemanticError::MissingSigningPubkey);
-		}
-
 		let mut bytes = Vec::new();
 		self.offer.write(&mut bytes).unwrap();
 
@@ -332,7 +329,7 @@ pub(super) struct OfferContents {
 	issuer: Option<String>,
 	paths: Option<Vec<BlindedPath>>,
 	supported_quantity: Quantity,
-	signing_pubkey: Option<PublicKey>,
+	signing_pubkey: PublicKey,
 }
 
 impl Offer {
@@ -546,7 +543,7 @@ impl OfferContents {
 	}
 
 	pub(super) fn signing_pubkey(&self) -> PublicKey {
-		self.signing_pubkey.unwrap()
+		self.signing_pubkey
 	}
 
 	/// Verifies that the offer metadata was produced from the offer in the TLV stream.
@@ -599,7 +596,7 @@ impl OfferContents {
 			paths: self.paths.as_ref(),
 			issuer: self.issuer.as_ref(),
 			quantity_max: self.supported_quantity.to_tlv_record(),
-			node_id: self.signing_pubkey.as_ref(),
+			node_id: Some(&self.signing_pubkey),
 		}
 	}
 }
@@ -745,7 +742,7 @@ impl TryFrom<OfferTlvStream> for OfferContents {
 
 		let signing_pubkey = match node_id {
 			None => return Err(SemanticError::MissingSigningPubkey),
-			Some(node_id) => Some(node_id),
+			Some(node_id) => node_id,
 		};
 
 		Ok(OfferContents {