Consistently check "no-std" in outbound_payment

The majority of the module checks against feature "no-std" to determine
whether or not SystemTime is available. However, the expiration checks
use feature "std". This leads to inconsistent behavior when both
features are set. Use only "no-std" for consistency.

Author: jkczyz

lightning/src/ln/outbound_payment.rs

@@ -319,7 +319,7 @@ impl Retry {
 	}
 }
 
-#[cfg(feature = "std")]
+#[cfg(not(feature = "no-std"))]
 pub(super) fn has_expired(route_params: &RouteParameters) -> bool {
 	if let Some(expiry_time) = route_params.payment_params.expiry_time {
 		if let Ok(elapsed) = std::time::SystemTime::UNIX_EPOCH.elapsed() {
@@ -894,7 +894,7 @@ impl OutboundPayments {
 		IH: Fn() -> InFlightHtlcs,
 		SP: Fn(SendAlongPathArgs) -> Result<(), APIError>,
 	{
-		#[cfg(feature = "std")] {
+		#[cfg(not(feature = "no-std"))] {
 			if has_expired(&route_params) {
 				log_error!(logger, "Payment with id {} and hash {} had expired before we started paying",
 					payment_id, payment_hash);
@@ -951,7 +951,7 @@ impl OutboundPayments {
 		IH: Fn() -> InFlightHtlcs,
 		SP: Fn(SendAlongPathArgs) -> Result<(), APIError>,
 	{
-		#[cfg(feature = "std")] {
+		#[cfg(not(feature = "no-std"))] {
 			if has_expired(&route_params) {
 				log_error!(logger, "Payment params expired on retry, abandoning payment {}", &payment_id);
 				self.abandon_payment(payment_id, PaymentFailureReason::PaymentExpired, pending_events);
@@ -1830,7 +1830,7 @@ mod tests {
 	use crate::ln::features::{ChannelFeatures, NodeFeatures};
 	use crate::ln::msgs::{ErrorAction, LightningError};
 	use crate::ln::outbound_payment::{Bolt12PaymentError, OutboundPayments, Retry, RetryableSendFailure, StaleExpiration};
-	#[cfg(feature = "std")]
+	#[cfg(not(feature = "no-std"))]
 	use crate::offers::invoice::DEFAULT_RELATIVE_EXPIRY;
 	use crate::offers::offer::OfferBuilder;
 	use crate::offers::test_utils::*;
@@ -1865,12 +1865,12 @@ mod tests {
 	}
 
 	#[test]
-	#[cfg(feature = "std")]
+	#[cfg(not(feature = "no-std"))]
 	fn fails_paying_after_expiration() {
 		do_fails_paying_after_expiration(false);
 		do_fails_paying_after_expiration(true);
 	}
-	#[cfg(feature = "std")]
+	#[cfg(not(feature = "no-std"))]
 	fn do_fails_paying_after_expiration(on_retry: bool) {
 		let outbound_payments = OutboundPayments::new();
 		let logger = test_utils::TestLogger::new();
@@ -2160,7 +2160,7 @@ mod tests {
 		assert!(pending_events.lock().unwrap().is_empty());
 	}
 
-	#[cfg(feature = "std")]
+	#[cfg(not(feature = "no-std"))]
 	#[test]
 	fn fails_sending_payment_for_expired_bolt12_invoice() {
 		let logger = test_utils::TestLogger::new();