Replace expect_value_msat with expect_send

Modify all InvoicePayer unit tests to use expect_send instead of
expect_value_msat, since the former can discern whether the send was for
an invoice, spontaneous payment, or a retry. Updates tests to set payer
expectations if they weren't already, where it made sense.

Author: jkczyz

lightning-invoice/src/payment.rs

@@ -579,8 +579,9 @@ mod tests {
 		let payment_preimage = PaymentPreimage([1; 32]);
 		let invoice = invoice(payment_preimage);
 		let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner());
+		let final_value_msat = invoice.amount_milli_satoshis().unwrap();
 
-		let payer = TestPayer::new();
+		let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
@@ -608,8 +609,8 @@ mod tests {
 		let final_value_msat = invoice.amount_milli_satoshis().unwrap();
 
 		let payer = TestPayer::new()
-			.expect_value_msat(final_value_msat)
-			.expect_value_msat(final_value_msat / 2);
+			.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();
@@ -650,7 +651,9 @@ mod tests {
 		let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner());
 		let final_value_msat = invoice.amount_milli_satoshis().unwrap();
 
-		let payer = TestPayer::new();
+		let payer = TestPayer::new()
+			.expect_send(Amount::OnRetry(final_value_msat / 2))
+			.expect_send(Amount::OnRetry(final_value_msat / 2));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
@@ -693,9 +696,9 @@ mod tests {
 		let final_value_msat = invoice.amount_milli_satoshis().unwrap();
 
 		let payer = TestPayer::new()
-			.expect_value_msat(final_value_msat)
-			.expect_value_msat(final_value_msat / 2)
-			.expect_value_msat(final_value_msat / 2);
+			.expect_send(Amount::ForInvoice(final_value_msat))
+			.expect_send(Amount::OnRetry(final_value_msat / 2))
+			.expect_send(Amount::OnRetry(final_value_msat / 2));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
@@ -745,15 +748,17 @@ 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));
 		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(2));
 
-		let payment_preimage = PaymentPreimage([1; 32]);
-		let invoice = invoice(payment_preimage);
 		let payment_id = Some(invoice_payer.pay_invoice(&invoice).unwrap());
 		assert_eq!(*payer.attempts.borrow(), 1);
 
@@ -796,15 +801,17 @@ 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));
 		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(2));
 
-		let payment_preimage = PaymentPreimage([1; 32]);
-		let invoice = invoice(payment_preimage);
 		let payment_id = Some(invoice_payer.pay_invoice(&invoice).unwrap());
 		assert_eq!(*payer.attempts.borrow(), 1);
 
@@ -838,7 +845,7 @@ mod tests {
 
 		let payer = TestPayer::new()
 			.fails_on_attempt(2)
-			.expect_value_msat(final_value_msat);
+			.expect_send(Amount::ForInvoice(final_value_msat));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
@@ -868,15 +875,17 @@ 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));
 		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(2));
 
-		let payment_preimage = PaymentPreimage([1; 32]);
-		let invoice = invoice(payment_preimage);
 		let payment_id = Some(invoice_payer.pay_invoice(&invoice).unwrap());
 		assert_eq!(*payer.attempts.borrow(), 1);
 
@@ -985,7 +994,7 @@ mod tests {
 		let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner());
 		let final_value_msat = 100;
 
-		let payer = TestPayer::new().expect_value_msat(final_value_msat);
+		let payer = TestPayer::new().expect_send(Amount::ForInvoice(final_value_msat));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
@@ -1038,7 +1047,7 @@ mod tests {
 
 		let payer = TestPayer::new()
 			.expect_send(Amount::Spontaneous(final_value_msat))
-			.expect_send(Amount::ForInvoiceOrRetry(final_value_msat));
+			.expect_send(Amount::OnRetry(final_value_msat));
 		let router = TestRouter {};
 		let scorer = RefCell::new(TestScorer::new());
 		let logger = TestLogger::new();
@@ -1229,8 +1238,9 @@ mod tests {
 
 	#[derive(Clone, Debug, PartialEq, Eq)]
 	enum Amount {
-		ForInvoiceOrRetry(u64),
+		ForInvoice(u64),
 		Spontaneous(u64),
+		OnRetry(u64),
 	}
 
 	impl TestPayer {
@@ -1242,11 +1252,6 @@ mod tests {
 			}
 		}
 
-		fn expect_value_msat(self, value_msat: u64) -> Self {
-			self.expectations.borrow_mut().push_back(Amount::ForInvoiceOrRetry(value_msat));
-			self
-		}
-
 		fn expect_send(self, value_msat: Amount) -> Self {
 			self.expectations.borrow_mut().push_back(value_msat);
 			self
@@ -1307,7 +1312,7 @@ mod tests {
 			_payment_secret: &Option<PaymentSecret>
 		) -> Result<PaymentId, PaymentSendFailure> {
 			if self.check_attempts() {
-				self.check_value_msats(Amount::ForInvoiceOrRetry(route.get_total_amount()));
+				self.check_value_msats(Amount::ForInvoice(route.get_total_amount()));
 				Ok(PaymentId([1; 32]))
 			} else {
 				Err(PaymentSendFailure::ParameterError(APIError::MonitorUpdateFailed))
@@ -1331,7 +1336,7 @@ mod tests {
 			&self, route: &Route, _payment_id: PaymentId
 		) -> Result<(), PaymentSendFailure> {
 			if self.check_attempts() {
-				self.check_value_msats(Amount::ForInvoiceOrRetry(route.get_total_amount()));
+				self.check_value_msats(Amount::OnRetry(route.get_total_amount()));
 				Ok(())
 			} else {
 				Err(PaymentSendFailure::ParameterError(APIError::MonitorUpdateFailed))