f simpler expiry check + test

Author: TheBlueMatt

lightning-invoice/src/payment.rs

@@ -253,6 +253,10 @@ where
 	) -> Result<PaymentId, PaymentError> {
 		debug_assert!(invoice.amount_milli_satoshis().is_some() ^ amount_msats.is_some());
 		let payment_hash = PaymentHash(invoice.payment_hash().clone().into_inner());
+		if invoice.is_expired() {
+			log_trace!(self.logger, "Invoice expired prior to first send for payment {}", log_bytes!(payment_hash.0));
+			return Err(PaymentError::Invoice("Invoice expired prior to send"));
+		}
 		let retry_data_payment_id = loop {
 			let mut payment_cache = self.payment_cache.lock().unwrap();
 			match payment_cache.entry(payment_hash) {
@@ -269,10 +273,6 @@ where
 						final_value_msat: invoice.amount_milli_satoshis().or(amount_msats).unwrap(),
 						final_cltv_expiry_delta: invoice.min_final_cltv_expiry() as u32,
 					};
-					if has_expired(&params) {
-						log_trace!(self.logger, "Invoice expired prior to first send for payment {}", log_bytes!(payment_hash.0));
-						return Err(PaymentError::Invoice("Invoice expired prior to send"));
-					}
 					let first_hops = self.payer.first_hops();
 					let route = self.router.find_route(
 						&payer,
@@ -752,7 +752,6 @@ mod tests {
 		let payment_preimage = PaymentPreimage([1; 32]);
 		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);