f - refactor builder checks

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -577,7 +577,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();
 		let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -589,7 +589,7 @@ mod tests {
 			.chain(Network::Testnet)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.chain(Network::Testnet)
+			.chain(Network::Testnet).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 		let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -602,7 +602,7 @@ mod tests {
 			.chain(Network::Testnet)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.chain(Network::Bitcoin)
+			.chain(Network::Bitcoin).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 		let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -611,11 +611,12 @@ mod tests {
 
 		let invoice_request = OfferBuilder::new("foo".into(), recipient_pubkey())
 			.amount_msats(1000)
+			.chain(Network::Bitcoin)
 			.chain(Network::Testnet)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.chain(Network::Bitcoin)
-			.chain(Network::Testnet)
+			.chain(Network::Bitcoin).unwrap()
+			.chain(Network::Testnet).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 		let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -628,6 +629,16 @@ mod tests {
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
 			.chain(Network::Bitcoin)
+		{
+			Ok(_) => panic!("expected error"),
+			Err(e) => assert_eq!(e, SemanticError::UnsupportedChain),
+		}
+
+		match OfferBuilder::new("foo".into(), recipient_pubkey())
+			.amount_msats(1000)
+			.chain(Network::Testnet)
+			.build().unwrap()
+			.request_invoice(vec![1; 32], payer_pubkey())
 			.build()
 		{
 			Ok(_) => panic!("expected error"),
@@ -641,7 +652,7 @@ mod tests {
 			.amount_msats(1000)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(1000)
+			.amount_msats(1000).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 		let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -652,8 +663,8 @@ mod tests {
 			.amount_msats(1000)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(999)
-			.amount_msats(1000)
+			.amount_msats(1001).unwrap()
+			.amount_msats(1000).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 		let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -664,7 +675,7 @@ mod tests {
 			.amount_msats(1000)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
-			.amount_msats(1001)
+			.amount_msats(1001).unwrap()
 			.build().unwrap()
 			.sign(payer_sign).unwrap();
 		let (_, _, tlv_stream, _) = invoice_request.as_tlv_stream();
@@ -676,7 +687,6 @@ mod tests {
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
 			.amount_msats(999)
-			.build()
 		{
 			Ok(_) => panic!("expected error"),
 			Err(e) => assert_eq!(e, SemanticError::InsufficientAmount),
@@ -687,7 +697,19 @@ mod tests {
 			.supported_quantity(Quantity::Unbounded)
 			.build().unwrap()
 			.request_invoice(vec![1; 32], payer_pubkey())
+			.quantity(2).unwrap()
 			.amount_msats(1000)
+		{
+			Ok(_) => panic!("expected error"),
+			Err(e) => assert_eq!(e, SemanticError::InsufficientAmount),
+		}
+
+		match OfferBuilder::new("foo".into(), recipient_pubkey())
+			.amount_msats(1000)
+			.supported_quantity(Quantity::Unbounded)
+			.build().unwrap()
+			.request_invoice(vec![1; 32], payer_pubkey())
+			.amount_msats(1000).unwrap()
 			.quantity(2).unwrap()
 			.build()
 		{
@@ -725,7 +747,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(2)
 		{
 			Ok(_) => panic!("expected error"),
@@ -737,7 +759,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();
@@ -750,7 +772,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(11)
 		{
 			Ok(_) => panic!("expected error"),
@@ -762,7 +784,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();