Only include channel_update in failure if needed by error code

This simplifies the failure path by allowing us to return the general
error code for a failure, which we can then amend based on whether it
was for a phantom forward.

Author: wpaulino

lightning/src/ln/channelmanager.rs

@@ -3180,13 +3180,6 @@ where
 		if let Err((err_msg, err_code)) = check_incoming_htlc_cltv(
 			cur_height, next_packet_details.outgoing_cltv_value, msg.cltv_expiry
 		) {
-			if err_code & 0x1000 != 0 && chan_update_opt.is_none() {
-				// We really should set `incorrect_cltv_expiry` here but as we're not
-				// forwarding over a real channel we can't generate a channel_update
-				// for it. Instead we just return a generic temporary_node_failure.
-				return Err((err_msg, 0x2000 | 2, None));
-			}
-			let chan_update_opt = if err_code & 0x1000 != 0 { chan_update_opt } else { None };
 			return Err((err_msg, err_code, chan_update_opt));
 		}
 
@@ -3199,7 +3192,8 @@ where
 		shared_secret: &[u8; 32]
 	) -> HTLCFailureMsg {
 		let mut res = VecWriter(Vec::with_capacity(chan_update.serialized_length() + 2 + 8 + 2));
-		if let Some(chan_update) = chan_update {
+		if chan_update.is_some() && err_code & 0x1000 == 0x1000 {
+			let chan_update = chan_update.unwrap();
 			if err_code == 0x1000 | 11 || err_code == 0x1000 | 12 {
 				msg.amount_msat.write(&mut res).expect("Writes cannot fail");
 			}