f - More send expectation to prevent failures in next commit

Author: jkczyz

lightning-invoice/src/payment.rs

@@ -832,7 +832,8 @@ mod tests {
 
 		let payer = TestPayer::new()
 			.fails_on_attempt(2)
-			.expect_send(Amount::ForInvoice(final_value_msat));
+			.expect_send(Amount::ForInvoice(final_value_msat))
+			.expect_send(Amount::OnRetry(final_value_msat / 2));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
@@ -896,15 +897,19 @@ mod tests {
 		let event_handled = core::cell::RefCell::new(false);
 		let event_handler = |_: &_| { *event_handled.borrow_mut() = true; };
 
-		let payer = TestPayer::new();
+		let payment_preimage = PaymentPreimage([1; 32]);
+		let invoice = invoice(payment_preimage);
+		let final_value_msat = invoice.amount_milli_satoshis().unwrap();
+
+		let payer = TestPayer::new()
+			.expect_send(Amount::ForInvoice(final_value_msat))
+			.expect_send(Amount::ForInvoice(final_value_msat));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
 		let invoice_payer =
 			InvoicePayer::new(&payer, router, &scorer, &logger, event_handler, RetryAttempts(0));
 
-		let payment_preimage = PaymentPreimage([1; 32]);
-		let invoice = invoice(payment_preimage);
 		let payment_id = Some(invoice_payer.pay_invoice(&invoice).unwrap());
 
 		// Cannot repay an invoice pending payment.
@@ -955,15 +960,19 @@ mod tests {
 
 	#[test]
 	fn fails_paying_invoice_with_sending_errors() {
-		let payer = TestPayer::new().fails_on_attempt(1);
+		let payment_preimage = PaymentPreimage([1; 32]);
+		let invoice = invoice(payment_preimage);
+		let final_value_msat = invoice.amount_milli_satoshis().unwrap();
+
+		let payer = TestPayer::new()
+			.fails_on_attempt(1)
+			.expect_send(Amount::ForInvoice(final_value_msat));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
 		let invoice_payer =
 			InvoicePayer::new(&payer, router, &scorer, &logger, |_: &_| {}, RetryAttempts(0));
 
-		let payment_preimage = PaymentPreimage([1; 32]);
-		let invoice = invoice(payment_preimage);
 		match invoice_payer.pay_invoice(&invoice) {
 			Err(PaymentError::Sending(_)) => {},
 			Err(_) => panic!("unexpected error"),
@@ -1086,7 +1095,9 @@ mod tests {
 		let short_channel_id = Some(path[0].short_channel_id);
 
 		// Expect that scorer is given short_channel_id upon handling the event.
-		let payer = TestPayer::new();
+		let payer = TestPayer::new()
+			.expect_send(Amount::ForInvoice(final_value_msat))
+			.expect_send(Amount::OnRetry(final_value_msat / 2));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new().expect_channel_failure(short_channel_id.unwrap()));
 		let logger = TestLogger::new();
@@ -1254,13 +1265,13 @@ mod tests {
 			}
 		}
 
-		fn check_attempts(&self) -> bool {
+		fn check_attempts(&self) -> Result<PaymentId, PaymentSendFailure> {
 			let mut attempts = self.attempts.borrow_mut();
 			*attempts += 1;
 			match self.failing_on_attempt {
-				None => true,
-				Some(attempt) if attempt != *attempts => true,
-				Some(_) => false,
+				None => Ok(PaymentId([1; 32])),
+				Some(attempt) if attempt != *attempts => Ok(PaymentId([1; 32])),
+				Some(_) => Err(PaymentSendFailure::ParameterError(APIError::MonitorUpdateFailed)),
 			}
 		}
 
@@ -1295,41 +1306,25 @@ mod tests {
 		}
 
 		fn send_payment(
-			&self,
-			route: &Route,
-			_payment_hash: PaymentHash,
+			&self, route: &Route, _payment_hash: PaymentHash,
 			_payment_secret: &Option<PaymentSecret>
 		) -> Result<PaymentId, PaymentSendFailure> {
-			if self.check_attempts() {
-				self.check_value_msats(Amount::ForInvoice(route.get_total_amount()));
-				Ok(PaymentId([1; 32]))
-			} else {
-				Err(PaymentSendFailure::ParameterError(APIError::MonitorUpdateFailed))
-			}
+			self.check_value_msats(Amount::ForInvoice(route.get_total_amount()));
+			self.check_attempts()
 		}
 
 		fn send_spontaneous_payment(
-			&self,
-			route: &Route,
-			_payment_preimage: PaymentPreimage,
+			&self, route: &Route, _payment_preimage: PaymentPreimage,
 		) -> Result<PaymentId, PaymentSendFailure> {
-			if self.check_attempts() {
-				self.check_value_msats(Amount::Spontaneous(route.get_total_amount()));
-				Ok(PaymentId([1; 32]))
-			} else {
-				Err(PaymentSendFailure::ParameterError(APIError::MonitorUpdateFailed))
-			}
+			self.check_value_msats(Amount::Spontaneous(route.get_total_amount()));
+			self.check_attempts()
 		}
 
 		fn retry_payment(
 			&self, route: &Route, _payment_id: PaymentId
 		) -> Result<(), PaymentSendFailure> {
-			if self.check_attempts() {
-				self.check_value_msats(Amount::OnRetry(route.get_total_amount()));
-				Ok(())
-			} else {
-				Err(PaymentSendFailure::ParameterError(APIError::MonitorUpdateFailed))
-			}
+			self.check_value_msats(Amount::OnRetry(route.get_total_amount()));
+			self.check_attempts().map(|_| ())
 		}
 	}