fixup! feat(offers): add BOLT 12 payer proof primitives

fixup! feat(offers): add BOLT 12 payer proof primitives

Author: vincenzopalazzo

lightning/src/offers/payer_proof.rs

@@ -510,10 +510,10 @@ tlv_stream!(
 // includes them as leaves.
 tlv_stream!(
 	PayerProofDataTlvStream, PayerProofDataTlvStreamRef<'a>, PAYER_PROOF_DATA_TYPES, {
-		(PAYER_PROOF_PREIMAGE_TYPE, preimage: PaymentPreimage),
-		(PAYER_PROOF_OMITTED_TLVS_TYPE, omitted_markers: (Vec<BigSize>, WithoutLength)),
-		(PAYER_PROOF_MISSING_HASHES_TYPE, missing_hashes: (Vec<sha256::Hash>, WithoutLength)),
-		(PAYER_PROOF_LEAF_HASHES_TYPE, leaf_hashes: (Vec<sha256::Hash>, WithoutLength)),
+		(PAYER_PROOF_PREIMAGE_TYPE, proof_preimage: PaymentPreimage),
+		(PAYER_PROOF_OMITTED_TLVS_TYPE, proof_omitted_markers: (Vec<BigSize>, WithoutLength)),
+		(PAYER_PROOF_MISSING_HASHES_TYPE, proof_missing_hashes: (Vec<sha256::Hash>, WithoutLength)),
+		(PAYER_PROOF_LEAF_HASHES_TYPE, proof_leaf_hashes: (Vec<sha256::Hash>, WithoutLength)),
 		(PAYER_PROOF_PROOF_NOTE_TYPE, proof_note: (String, WithoutLength)),
 	}
 );
@@ -605,15 +605,15 @@ impl UnsignedPayerProof<'_> {
 		};
 		signatures.write(&mut bytes).expect("Vec write should not fail");
 
-		let omitted_markers = (!self.disclosure.omitted_markers.is_empty()).then(|| {
+		let proof_omitted_markers = (!self.disclosure.omitted_markers.is_empty()).then(|| {
 			self.disclosure.omitted_markers.iter().copied().map(BigSize).collect::<Vec<_>>()
 		});
 		let data = PayerProofDataTlvStreamRef {
-			preimage: Some(&self.preimage),
-			omitted_markers: omitted_markers.as_ref(),
-			missing_hashes: (!self.disclosure.missing_hashes.is_empty())
+			proof_preimage: Some(&self.preimage),
+			proof_omitted_markers: proof_omitted_markers.as_ref(),
+			proof_missing_hashes: (!self.disclosure.missing_hashes.is_empty())
 				.then_some(&self.disclosure.missing_hashes),
-			leaf_hashes: (!self.disclosure.leaf_hashes.is_empty())
+			proof_leaf_hashes: (!self.disclosure.leaf_hashes.is_empty())
 				.then_some(&self.disclosure.leaf_hashes),
 			proof_note: self.payer_note.as_ref(),
 		};
@@ -774,10 +774,10 @@ impl TryFrom<FullPayerProofTlvStream> for ParsedPayerProofFields {
 			InvoiceTlvStream { created_at, payment_hash, amount, node_id, .. },
 			PayerProofSignatureTlvStream { invoice_signature, proof_signature },
 			PayerProofDataTlvStream {
-				preimage,
-				omitted_markers,
-				missing_hashes,
-				leaf_hashes,
+				proof_preimage,
+				proof_omitted_markers,
+				proof_missing_hashes,
+				proof_leaf_hashes,
 				proof_note,
 			},
 			_experimental_offer,
@@ -794,7 +794,7 @@ impl TryFrom<FullPayerProofTlvStream> for ParsedPayerProofFields {
 			.ok_or(Bolt12ParseError::InvalidSemantics(Bolt12SemanticError::MissingSigningPubkey))?;
 		let invoice_signature = invoice_signature
 			.ok_or(Bolt12ParseError::InvalidSemantics(Bolt12SemanticError::MissingSignature))?;
-		let preimage = preimage.ok_or(Bolt12ParseError::Decode(DecodeError::InvalidValue))?;
+		let preimage = proof_preimage.ok_or(Bolt12ParseError::Decode(DecodeError::InvalidValue))?;
 		let proof_signature = proof_signature
 			.ok_or(Bolt12ParseError::InvalidSemantics(Bolt12SemanticError::MissingSignature))?;
 
@@ -814,13 +814,13 @@ impl TryFrom<FullPayerProofTlvStream> for ParsedPayerProofFields {
 					invoice_created_at: created_at.map(Duration::from_secs),
 				},
 			},
-			omitted_markers: omitted_markers
+			omitted_markers: proof_omitted_markers
 				.unwrap_or_default()
 				.into_iter()
 				.map(|marker| marker.0)
 				.collect(),
-			missing_hashes: missing_hashes.unwrap_or_default(),
-			leaf_hashes: leaf_hashes.unwrap_or_default(),
+			missing_hashes: proof_missing_hashes.unwrap_or_default(),
+			leaf_hashes: proof_leaf_hashes.unwrap_or_default(),
 		})
 	}
 }