f: match HTLCHandlingFailureType::UnknownNextHop in if let

Author: carlaKC

lightning/src/events/mod.rs

@@ -2261,33 +2261,16 @@ impl MaybeReadable for Event {
 						(2, failure_type_opt, upgradable_required),
 					});
 
-					let event = Event::HTLCHandlingFailed {
-						prev_channel_id,
-						failure_type: _init_tlv_based_struct_field!(failure_type_opt, upgradable_required),
-						failure_reason,
-					};
-
 					// If a legacy HTLCHandlingFailureType::UnknownNextHop was written, upgrade
 					// it to its new representation, otherwise leave unchanged.
-					Ok(Some(match event {
-						Event::HTLCHandlingFailed { prev_channel_id, ref failure_type, ref failure_reason } => {
-							match failure_type {
-								HTLCHandlingFailureType::UnknownNextHop { requested_forward_scid } => {
-									debug_assert!(failure_reason.is_none(),
-										"new failure reason should not be written with legacy UnknownNextHop type");
-
-									Event::HTLCHandlingFailed {
-										prev_channel_id,
-										failure_type: HTLCHandlingFailureType::InvalidForward {
-											requested_forward_scid: *requested_forward_scid,
-										},
-										failure_reason: Some(LocalHTLCFailureReason::UnknownNextPeer.into()),
-									}
-								}
-								_ => event,
-							}
-						},
-						_ => panic!("Event::HTLCHandlingFailed type incorrect"),
+					if let Some(HTLCHandlingFailureType::UnknownNextHop { requested_forward_scid }) = failure_type_opt.0 {
+						failure_type_opt.0 = Some(HTLCHandlingFailureType::InvalidForward { requested_forward_scid });
+						failure_reason = Some(LocalHTLCFailureReason::UnknownNextPeer.into());
+					}
+					Ok(Some(Event::HTLCHandlingFailed {
+						prev_channel_id,
+						failure_type: _init_tlv_based_struct_field!(failure_type_opt, upgradable_required),
+						failure_reason
 					}))
 				};
 				f()