f rust 1.36, 1.41

Author: devrandom

.github/workflows/build.yml

@@ -125,14 +125,16 @@ jobs:
         if: "! matrix.build-net-tokio"
         run: |
           cargo test --verbose --color always -p lightning
-          cargo test --verbose --color always --features=test_utils -p lightning-invoice
+          # this one is different because rust 1.41 doesn't allow features in a virtual workspace root
+          (cd lightning-invoice && cargo test --verbose --color always --features=test_utils)
           cargo build --verbose --color always -p lightning-persister
           cargo build --verbose --color always -p lightning-background-processor
       - name: Test C Bindings Modifications on Rust ${{ matrix.toolchain }}
         if: "! matrix.build-net-tokio"
         run: |
           RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always -p lightning
-          RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --features=test_utils -p lightning-invoice
+          # this one is different because rust 1.41 doesn't allow features in a virtual workspace root
+          (cd lightning-invoice && RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --features=test_utils)
           RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-persister
           RUSTFLAGS="--cfg=c_bindings" cargo build --verbose --color always -p lightning-background-processor
       - name: Test Block Sync Clients on Rust ${{ matrix.toolchain }} with features

lightning-invoice/src/payment.rs

@@ -339,10 +339,11 @@ where
 	fn pay_internal<F: FnOnce(&Route) -> Result<PaymentId, PaymentSendFailure> + Copy>(
 		&self, params: &RouteParameters, payment_hash: PaymentHash, send_payment: F,
 	) -> Result<PaymentId, PaymentError> {
-		#[cfg(feature = "std")]
-		if has_expired(params) {
-			log_trace!(self.logger, "Invoice expired prior to send for payment {}", log_bytes!(payment_hash.0));
-			return Err(PaymentError::Invoice("Invoice expired prior to send"));
+		#[cfg(feature = "std")] {
+			if has_expired(params) {
+				log_trace!(self.logger, "Invoice expired prior to send for payment {}", log_bytes!(payment_hash.0));
+				return Err(PaymentError::Invoice("Invoice expired prior to send"));
+			}
 		}
 
 		let payer = self.payer.node_id();
@@ -402,10 +403,11 @@ where
 			return Err(());
 		}
 
-		#[cfg(feature = "std")]
-		if has_expired(params) {
-			log_trace!(self.logger, "Invoice expired for payment {}; not retrying (attempts: {})", log_bytes!(payment_hash.0), attempts);
-			return Err(());
+		#[cfg(feature = "std")] {
+			if has_expired(params) {
+				log_trace!(self.logger, "Invoice expired for payment {}; not retrying (attempts: {})", log_bytes!(payment_hash.0), attempts);
+				return Err(());
+			}
 		}
 
 		let payer = self.payer.node_id();