f - refactor builder checks

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -106,6 +106,13 @@ impl<'a> InvoiceRequestBuilder<'a> {
 		Ok(self)
 	}
 
+	#[cfg(test)]
+	pub fn chain_unchecked(mut self, network: Network) -> Self {
+		let chain = ChainHash::using_genesis_block(network);
+		self.invoice_request.chain = Some(chain);
+		self
+	}
+
 	/// Sets the [`InvoiceRequest::amount_msats`] for paying an invoice. Must be at least the base
 	/// invoice amount (i.e., [`Offer::amount`] times [`quantity`]).
 	///
@@ -120,6 +127,12 @@ impl<'a> InvoiceRequestBuilder<'a> {
 		Ok(self)
 	}
 
+	#[cfg(test)]
+	pub fn amount_msats_unchecked(mut self, amount_msats: u64) -> Self {
+		self.invoice_request.amount_msats = Some(amount_msats);
+		self
+	}
+
 	/// Sets the [`InvoiceRequest::features`].
 	///
 	/// Successive calls to this method will override the previous setting.
@@ -907,7 +920,7 @@ mod tests {
 			.amount_msats(1000)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.chain(Network::Bitcoin)
+			.chain(Network::Bitcoin).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 
@@ -922,7 +935,7 @@ mod tests {
 			.amount_msats(1000)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.chain(Network::Testnet)
+			.chain_unchecked(Network::Testnet)
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
 
@@ -954,7 +967,7 @@ mod tests {
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(1000)
+			.amount_msats(1000).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 
@@ -983,7 +996,7 @@ mod tests {
 			.amount_msats(1000)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(999)
+			.amount_msats_unchecked(999)
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
 
@@ -1037,7 +1050,7 @@ mod tests {
 			.supported_quantity(Quantity::one())
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(2_000)
+			.amount_msats(2_000).unwrap()
 			.quantity_unchecked(2)
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
@@ -1057,7 +1070,7 @@ mod tests {
 			.supported_quantity(Quantity::Bounded(ten))
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(10_000)
+			.amount_msats(10_000).unwrap()
 			.quantity(10).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
@@ -1074,7 +1087,7 @@ mod tests {
 			.supported_quantity(Quantity::Bounded(ten))
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(11_000)
+			.amount_msats(11_000).unwrap()
 			.quantity_unchecked(11)
 			.build_unchecked()
 			.sign(payer_sign).unwrap();
@@ -1092,7 +1105,7 @@ mod tests {
 			.supported_quantity(Quantity::Unbounded)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(2_000)
+			.amount_msats(2_000).unwrap()
 			.quantity(2).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();