f Drop res and associated returns in a few places

Author: tnull

lightning-liquidity/src/lsps2/service.rs

@@ -142,7 +142,7 @@ impl OutboundJITChannelState {
 		&mut self, opening_fee_params: &LSPS2OpeningFeeParams, payment_size_msat: &Option<u64>,
 		htlc: InterceptedHTLC,
 	) -> Result<Option<HTLCInterceptedAction>, ChannelStateError> {
-		let res = match self {
+		match self {
 			OutboundJITChannelState::PendingInitialPayment { payment_queue } => {
 				let (total_expected_outbound_amount_msat, num_htlcs) = payment_queue.add_htlc(htlc);
 
@@ -205,9 +205,9 @@ impl OutboundJITChannelState {
 						};
 						Ok(None)
 					} else {
-						return Err(ChannelStateError(
+						Err(ChannelStateError(
 							"Intercepted HTLC is too small to pay opening fee".to_string(),
-						));
+						))
 					}
 				}
 			},
@@ -268,14 +268,13 @@ impl OutboundJITChannelState {
 				*self = OutboundJITChannelState::PaymentForwarded { channel_id: *channel_id };
 				Ok(Some(forward))
 			},
-		};
-		res
+		}
 	}
 
 	fn channel_ready(
 		&mut self, channel_id: ChannelId,
 	) -> Result<ForwardPaymentAction, ChannelStateError> {
-		let res = match self {
+		match self {
 			OutboundJITChannelState::PendingChannelOpen { payment_queue, opening_fee_msat } => {
 				if let Some((_payment_hash, htlcs)) =
 					payment_queue.pop_greater_than_msat(*opening_fee_msat)
@@ -297,18 +296,15 @@ impl OutboundJITChannelState {
 					));
 				}
 			},
-			state => {
-				return Err(ChannelStateError(format!(
-					"Channel ready received when JIT Channel was in state: {:?}",
-					state
-				)))
-			},
-		};
-		res
+			state => Err(ChannelStateError(format!(
+				"Channel ready received when JIT Channel was in state: {:?}",
+				state
+			))),
+		}
 	}
 
 	fn htlc_handling_failed(&mut self) -> Result<Option<ForwardPaymentAction>, ChannelStateError> {
-		let res = match self {
+		match self {
 			OutboundJITChannelState::PendingPaymentForward {
 				payment_queue,
 				opening_fee_msat,
@@ -352,18 +348,15 @@ impl OutboundJITChannelState {
 				*self = OutboundJITChannelState::PaymentForwarded { channel_id: *channel_id };
 				Ok(None)
 			},
-			state => {
-				return Err(ChannelStateError(format!(
-					"HTLC handling failed when JIT Channel was in state: {:?}",
-					state
-				)))
-			},
-		};
-		res
+			state => Err(ChannelStateError(format!(
+				"HTLC handling failed when JIT Channel was in state: {:?}",
+				state
+			))),
+		}
 	}
 
 	fn payment_forwarded(&mut self) -> Result<Option<ForwardHTLCsAction>, ChannelStateError> {
-		let res = match self {
+		match self {
 			OutboundJITChannelState::PendingPaymentForward {
 				payment_queue, channel_id, ..
 			} => {
@@ -376,14 +369,11 @@ impl OutboundJITChannelState {
 				*self = OutboundJITChannelState::PaymentForwarded { channel_id: *channel_id };
 				Ok(None)
 			},
-			state => {
-				return Err(ChannelStateError(format!(
-					"Payment forwarded when JIT Channel was in state: {:?}",
-					state
-				)))
-			},
-		};
-		res
+			state => Err(ChannelStateError(format!(
+				"Payment forwarded when JIT Channel was in state: {:?}",
+				state
+			))),
+		}
 	}
 }