f expiry through event.

Author: TheBlueMatt

lightning-invoice/src/payment.rs

@@ -517,25 +517,6 @@ mod tests {
 			.unwrap()
 	}
 
-	fn will_expire_in_2_secs_invoice(payment_preimage: PaymentPreimage) -> Invoice {
-		let payment_hash = Sha256::hash(&payment_preimage.0);
-		let private_key = SecretKey::from_slice(&[42; 32]).unwrap();
-		let timestamp = SystemTime::now()
-			.checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME - 2))
-			.unwrap();
-		InvoiceBuilder::new(Currency::Bitcoin)
-			.description("test".into())
-			.payment_hash(payment_hash)
-			.payment_secret(PaymentSecret([0; 32]))
-			.timestamp(timestamp)
-			.min_final_cltv_expiry(144)
-			.amount_milli_satoshis(128)
-			.build_signed(|hash| {
-				Secp256k1::new().sign_recoverable(hash, &private_key)
-			})
-			.unwrap()
-	}
-
 	#[test]
 	fn pays_invoice_on_first_attempt() {
 		let event_handled = core::cell::RefCell::new(false);
@@ -769,11 +750,15 @@ mod tests {
 			InvoicePayer::new(&payer, router, &scorer, &logger, event_handler, RetryAttempts(2));
 
 		let payment_preimage = PaymentPreimage([1; 32]);
-		let invoice = will_expire_in_2_secs_invoice(payment_preimage);
+		let invoice = invoice(payment_preimage);
 		let payment_id = Some(invoice_payer.pay_invoice(&invoice).unwrap());
 		std::thread::sleep(Duration::from_secs(4));
 		assert_eq!(*payer.attempts.borrow(), 1);
 
+		let mut retry_data = TestRouter::retry_for_invoice(&invoice);
+		retry_data.payee.expiry_time = Some(SystemTime::now()
+			.checked_sub(Duration::from_secs(2)).unwrap()
+			.duration_since(SystemTime::UNIX_EPOCH).unwrap().as_secs());
 		let event = Event::PaymentPathFailed {
 			payment_id,
 			payment_hash: PaymentHash(invoice.payment_hash().clone().into_inner()),
@@ -782,7 +767,7 @@ mod tests {
 			all_paths_failed: false,
 			path: vec![],
 			short_channel_id: None,
-			retry: Some(TestRouter::retry_for_invoice(&invoice)),
+			retry: Some(retry_data),
 		};
 		invoice_payer.handle_event(&event);
 		assert_eq!(*event_handled.borrow(), true);