f - don't use PaymentId for MetadataMaterial::encrypted_payment_id

Author: jkczyz

lightning/src/offers/signer.rs

@@ -149,7 +149,7 @@ pub(super) struct MetadataMaterial {
 	nonce: Nonce,
 	hmac: HmacEngine<Sha256>,
 	// Some for payer metadata and None for offer metadata
-	encrypted_payment_id: Option<PaymentId>,
+	encrypted_payment_id: Option<[u8; PaymentId::LENGTH]>,
 }
 
 impl MetadataMaterial {
@@ -159,7 +159,7 @@ impl MetadataMaterial {
 	) -> Self {
 		// Encrypt payment_id
 		let encrypted_payment_id = payment_id.map(|payment_id| {
-			PaymentId(expanded_key.crypt_for_offer(payment_id.0, &nonce.0))
+			expanded_key.crypt_for_offer(payment_id.0, &nonce.0)
 		});
 
 		Self {
@@ -173,7 +173,7 @@ impl MetadataMaterial {
 		self.hmac.input(DERIVED_METADATA_HMAC_INPUT);
 		self.maybe_include_encrypted_payment_id();
 
-		let mut bytes = self.encrypted_payment_id.map(|id| id.0.to_vec()).unwrap_or(vec![]);
+		let mut bytes = self.encrypted_payment_id.map(|id| id.to_vec()).unwrap_or(vec![]);
 		bytes.extend_from_slice(self.nonce.as_slice());
 		bytes.extend_from_slice(&Hmac::from_engine(self.hmac).into_inner());
 		bytes
@@ -185,7 +185,7 @@ impl MetadataMaterial {
 		self.hmac.input(DERIVED_METADATA_AND_KEYS_HMAC_INPUT);
 		self.maybe_include_encrypted_payment_id();
 
-		let mut bytes = self.encrypted_payment_id.map(|id| id.0.to_vec()).unwrap_or(vec![]);
+		let mut bytes = self.encrypted_payment_id.map(|id| id.to_vec()).unwrap_or(vec![]);
 		bytes.extend_from_slice(self.nonce.as_slice());
 
 		let hmac = Hmac::from_engine(self.hmac);
@@ -200,7 +200,7 @@ impl MetadataMaterial {
 			None => self.hmac.input(WITHOUT_ENCRYPTED_PAYMENT_ID_HMAC_INPUT),
 			Some(encrypted_payment_id) => {
 				self.hmac.input(WITH_ENCRYPTED_PAYMENT_ID_HMAC_INPUT);
-				self.hmac.input(&encrypted_payment_id.0)
+				self.hmac.input(&encrypted_payment_id)
 			},
 		}
 	}