f - drop chain from InvoiceRequestFields

Author: jkczyz

lightning/src/ln/offers_tests.rs

@@ -412,7 +412,6 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 		offer_id: offer.id(),
 		invoice_request: InvoiceRequestFields {
 			payer_id: invoice_request.payer_id(),
-			chain: Some(invoice_request.chain()),
 			amount_msats: None,
 			features: InvoiceRequestFeatures::empty(),
 			quantity: None,
@@ -566,7 +565,6 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 		offer_id: offer.id(),
 		invoice_request: InvoiceRequestFields {
 			payer_id: invoice_request.payer_id(),
-			chain: Some(invoice_request.chain()),
 			amount_msats: None,
 			features: InvoiceRequestFeatures::empty(),
 			quantity: None,
@@ -689,7 +687,6 @@ fn pays_for_offer_without_blinded_paths() {
 		offer_id: offer.id(),
 		invoice_request: InvoiceRequestFields {
 			payer_id: invoice_request.payer_id(),
-			chain: Some(invoice_request.chain()),
 			amount_msats: None,
 			features: InvoiceRequestFeatures::empty(),
 			quantity: None,

lightning/src/offers/invoice_request.rs

@@ -877,13 +877,12 @@ impl VerifiedInvoiceRequest {
 		let InvoiceRequestContents {
 			payer_id,
 			inner: InvoiceRequestContentsWithoutPayerId {
-				payer: _, offer: _, chain, amount_msats, features, quantity, payer_note
+				payer: _, offer: _, chain: _, amount_msats, features, quantity, payer_note
 			},
 		} = &self.inner.contents;
 
 		InvoiceRequestFields {
 			payer_id: *payer_id,
-			chain: *chain,
 			amount_msats: *amount_msats,
 			features: features.clone(),
 			quantity: *quantity,
@@ -1127,9 +1126,6 @@ pub struct InvoiceRequestFields {
 	/// A possibly transient pubkey used to sign the invoice request.
 	pub payer_id: PublicKey,
 
-	/// A chain from [`Offer::chains`] that the offer is valid for.
-	pub chain: Option<ChainHash>,
-
 	/// The amount to pay in msats (i.e., the minimum lightning-payable unit for [`chain`]), which
 	/// must be greater than or equal to [`Offer::amount`], converted if necessary.
 	///
@@ -1154,11 +1150,10 @@ impl Writeable for InvoiceRequestFields {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 		write_tlv_fields!(writer, {
 			(0, self.payer_id, required),
-			(2, self.chain, option),
-			(4, self.amount_msats, option),
-			(6, WithoutLength(&self.features), required),
-			(8, self.quantity, option),
-			(10, self.payer_note_truncated, option),
+			(2, self.amount_msats, option),
+			(4, WithoutLength(&self.features), required),
+			(6, self.quantity, option),
+			(8, self.payer_note_truncated, option),
 		});
 		Ok(())
 	}
@@ -1168,17 +1163,15 @@ impl Readable for InvoiceRequestFields {
 	fn read<R: io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
 		_init_and_read_len_prefixed_tlv_fields!(reader, {
 			(0, payer_id, required),
-			(2, chain, option),
-			(4, amount_msats, option),
-			(6, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
-			(8, quantity, option),
-			(10, payer_note_truncated, option),
+			(2, amount_msats, option),
+			(4, features, (option, encoding: (InvoiceRequestFeatures, WithoutLength))),
+			(6, quantity, option),
+			(8, payer_note_truncated, option),
 		});
 		let features = features.unwrap_or(InvoiceRequestFeatures::empty());
 
 		Ok(InvoiceRequestFields {
-			payer_id: payer_id.0.unwrap(), chain, amount_msats, features, quantity,
-			payer_note_truncated,
+			payer_id: payer_id.0.unwrap(), amount_msats, features, quantity, payer_note_truncated,
 		})
 	}
 }
@@ -2282,7 +2275,6 @@ mod tests {
 					invoice_request.fields(),
 					InvoiceRequestFields {
 						payer_id: payer_pubkey(),
-						chain: Some(ChainHash::using_genesis_block(Network::Testnet)),
 						amount_msats: Some(1001),
 						features: InvoiceRequestFeatures::empty(),
 						quantity: Some(1),