f - refactor payer into submodule

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -16,10 +16,10 @@ use core::convert::TryFrom;
 use core::str::FromStr;
 use io;
 use ln::features::OfferFeatures;
-use offers::{PayerTlvStream, self};
 use offers::merkle::{SignatureTlvStream, self};
 use offers::offer::{Amount, OfferContents, OfferTlvStream, self};
 use offers::parse::{Bech32Encode, ParseError, SemanticError};
+use offers::payer::{PayerContents, PayerTlvStream, self};
 use util::ser::{Writeable, Writer};
 
 ///
@@ -30,14 +30,14 @@ pub struct InvoiceRequest {
 
 ///
 pub(crate) struct InvoiceRequestContents {
+	payer: PayerContents,
 	offer: OfferContents,
 	chain: Option<BlockHash>,
 	amount_msats: Option<u64>,
 	features: Option<OfferFeatures>,
 	quantity: Option<u64>,
 	payer_id: PublicKey,
 	payer_note: Option<String>,
-	payer_info: Option<Vec<u8>>,
 	signature: Option<Signature>,
 }
 
@@ -49,8 +49,8 @@ impl AsRef<[u8]> for InvoiceRequest {
 
 impl InvoiceRequestContents {
 	pub(super) fn as_tlv_stream(&self) -> ReferencedFullInvoiceRequestTlvStream {
-		let payer = offers::reference::PayerTlvStream {
-			payer_info: self.payer_info.as_ref().map(Into::into),
+		let payer = payer::reference::PayerTlvStream {
+			payer_info: self.payer.0.as_ref().map(Into::into),
 		};
 
 		let offer = self.offer.as_tlv_stream();
@@ -97,7 +97,7 @@ type FullInvoiceRequestTlvStream =
 	(PayerTlvStream, OfferTlvStream, InvoiceRequestTlvStream, SignatureTlvStream);
 
 type ReferencedFullInvoiceRequestTlvStream<'a> = (
-	offers::reference::PayerTlvStream<'a>,
+	payer::reference::PayerTlvStream<'a>,
 	offer::reference::OfferTlvStream<'a>,
 	reference::InvoiceRequestTlvStream<'a>,
 	merkle::reference::SignatureTlvStream<'a>,
@@ -130,6 +130,7 @@ impl TryFrom<FullInvoiceRequestTlvStream> for InvoiceRequestContents {
 			SignatureTlvStream { signature },
 		) = tlv_stream;
 
+		let payer = PayerContents(payer_info.map(Into::into));
 		let offer = OfferContents::try_from(offer_tlv_stream)?;
 
 		let chain = match chain {
@@ -171,11 +172,8 @@ impl TryFrom<FullInvoiceRequestTlvStream> for InvoiceRequestContents {
 
 		let payer_note = payer_note.map(Into::into);
 
-		let payer_info = payer_info.map(Into::into);
-
 		Ok(InvoiceRequestContents {
-			offer, chain, amount_msats, features, quantity, payer_id, payer_note, payer_info,
-			signature,
+			payer, offer, chain, amount_msats, features, quantity, payer_id, payer_note, signature,
 		})
 	}
 }

lightning/src/offers/mod.rs

@@ -14,9 +14,6 @@ mod invoice_request;
 mod merkle;
 mod offer;
 mod parse;
+mod payer;
 
 pub use self::offer::{Amount, BlindedPath, CurrencyCode, Offer, OfferBuilder};
-
-tlv_stream!(struct PayerTlvStream {
-	(0, payer_info: Vec<u8>),
-});

lightning/src/offers/payer.rs

@@ -0,0 +1,21 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+//! Data structures and encoding for `invoice_request_payer_info` records.
+
+/// An unpredictable sequence of bytes typically containing information needed to derive
+/// [`InvoiceRequestContents::payer_id`].
+///
+/// [`InvoiceRequestContents::payer_id`]: invoice_request::InvoiceRequestContents::payer_id
+pub(crate) struct PayerContents(pub Option<Vec<u8>>);
+
+tlv_stream!(struct PayerTlvStream {
+	(0, payer_info: Vec<u8>),
+});
+