X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Foffers%2Frefund.rs;h=4628c334fbefa54d27386a127732c624e2976643;hb=022eadc4dbf0f60179674f936d604cade6c5dd9e;hp=9eda6ecd50c673e104b5c224beb59c1b5714d685;hpb=fd426a0018bf017d379eba26d922f6774e9d10e6;p=rust-lightning

diff --git a/lightning/src/offers/refund.rs b/lightning/src/offers/refund.rs
index 9eda6ecd..4628c334 100644
--- a/lightning/src/offers/refund.rs
+++ b/lightning/src/offers/refund.rs
@@ -86,6 +86,7 @@ use crate::offers::invoice_request::{InvoiceRequestTlvStream, InvoiceRequestTlvS
 use crate::offers::offer::{OfferTlvStream, OfferTlvStreamRef};
 use crate::offers::parse::{Bech32Encode, ParseError, ParsedMessage, SemanticError};
 use crate::offers::payer::{PayerContents, PayerTlvStream, PayerTlvStreamRef};
+use crate::offers::signer::Metadata;
 use crate::onion_message::BlindedPath;
 use crate::util::ser::{SeekReadable, WithoutLength, Writeable, Writer};
 use crate::util::string::PrintableString;
@@ -117,6 +118,7 @@ impl RefundBuilder {
 			return Err(SemanticError::InvalidAmount);
 		}
 
+		let metadata = Metadata::Bytes(metadata);
 		let refund = RefundContents {
 			payer: PayerContents(metadata), description, absolute_expiry: None, issuer: None,
 			paths: None, chain: None, amount_msats, features: InvoiceRequestFeatures::empty(),
@@ -216,7 +218,8 @@ impl RefundBuilder {
 ///
 /// [`Invoice`]: crate::offers::invoice::Invoice
 /// [`Offer`]: crate::offers::offer::Offer
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
 pub struct Refund {
 	pub(super) bytes: Vec<u8>,
 	pub(super) contents: RefundContents,
@@ -225,7 +228,8 @@ pub struct Refund {
 /// The contents of a [`Refund`], which may be shared with an [`Invoice`].
 ///
 /// [`Invoice`]: crate::offers::invoice::Invoice
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
 pub(super) struct RefundContents {
 	payer: PayerContents,
 	// offer fields
@@ -279,7 +283,7 @@ impl Refund {
 	///
 	/// [`payer_id`]: Self::payer_id
 	pub fn metadata(&self) -> &[u8] {
-		&self.contents.payer.0
+		&self.contents.payer.0.as_bytes().unwrap()[..]
 	}
 
 	/// A chain that the refund is valid for.
@@ -317,13 +321,12 @@ impl Refund {
 		self.contents.payer_note.as_ref().map(|payer_note| PrintableString(payer_note.as_str()))
 	}
 
-	/// Creates an [`Invoice`] for the refund with the given required fields and using the
+	/// Creates an [`InvoiceBuilder`] for the refund with the given required fields and using the
 	/// [`Duration`] since [`std::time::SystemTime::UNIX_EPOCH`] as the creation time.
 	///
 	/// See [`Refund::respond_with_no_std`] for further details where the aforementioned creation
 	/// time is used for the `created_at` parameter.
 	///
-	/// [`Invoice`]: crate::offers::invoice::Invoice
 	/// [`Duration`]: core::time::Duration
 	#[cfg(feature = "std")]
 	pub fn respond_with(
@@ -337,7 +340,7 @@ impl Refund {
 		self.respond_with_no_std(payment_paths, payment_hash, signing_pubkey, created_at)
 	}
 
-	/// Creates an [`Invoice`] for the refund with the given required fields.
+	/// Creates an [`InvoiceBuilder`] for the refund with the given required fields.
 	///
 	/// Unless [`InvoiceBuilder::relative_expiry`] is set, the invoice will expire two hours after
 	/// `created_at`, which is used to set [`Invoice::created_at`]. Useful for `no-std` builds where
@@ -356,7 +359,6 @@ impl Refund {
 	///
 	/// Errors if the request contains unknown required features.
 	///
-	/// [`Invoice`]: crate::offers::invoice::Invoice
 	/// [`Invoice::created_at`]: crate::offers::invoice::Invoice::created_at
 	pub fn respond_with_no_std(
 		&self, payment_paths: Vec<(BlindedPath, BlindedPayInfo)>, payment_hash: PaymentHash,
@@ -403,7 +405,7 @@ impl RefundContents {
 
 	pub(super) fn as_tlv_stream(&self) -> RefundTlvStreamRef {
 		let payer = PayerTlvStreamRef {
-			metadata: Some(&self.payer.0),
+			metadata: self.payer.0.as_bytes(),
 		};
 
 		let offer = OfferTlvStreamRef {
@@ -507,7 +509,7 @@ impl TryFrom<RefundTlvStream> for RefundContents {
 
 		let payer = match payer_metadata {
 			None => return Err(SemanticError::MissingPayerMetadata),
-			Some(metadata) => PayerContents(metadata),
+			Some(metadata) => PayerContents(Metadata::Bytes(metadata)),
 		};
 
 		if metadata.is_some() {