f No need to look up channel_id

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -3484,23 +3484,14 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 												log_bytes!(payment_hash.0), total_value, $payment_data.total_msat);
 											fail_htlc!(claimable_htlc, payment_hash);
 										} else if total_value == $payment_data.total_msat {
-											let (via_channel_id, via_user_channel_id) =
-												if let Some((_, chan_id)) = self.short_to_chan_info.read().unwrap().get(&prev_short_channel_id) {
-													match channel_state.by_id.entry(*chan_id) {
-														hash_map::Entry::Occupied(prev_chan) =>
-															(Some(chan_id.clone()), Some(prev_chan.get().get_user_id())),
-														_ => (None, None),
-													}
-												} else {
-													(None, None)
-												};
-
+											let prev_channel_id = prev_funding_outpoint.to_channel_id();
+											let via_user_channel_id = channel_state.by_id.get(&prev_channel_id).map(|chan| chan.get_user_id());
 											htlcs.push(claimable_htlc);
 											new_events.push(events::Event::PaymentReceived {
 												payment_hash,
 												purpose: purpose(),
 												amount_msat: total_value,
-												via_channel_id,
+												via_channel_id: Some(prev_channel_id),
 												via_user_channel_id,
 											});
 											payment_received_generated = true;
@@ -3541,21 +3532,13 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 													hash_map::Entry::Vacant(e) => {
 														let purpose = events::PaymentPurpose::SpontaneousPayment(preimage);
 														e.insert((purpose.clone(), vec![claimable_htlc]));
-														let (via_channel_id, via_user_channel_id) =
-															if let Some((_, chan_id)) = self.short_to_chan_info.read().unwrap().get(&prev_short_channel_id) {
-																match channel_state.by_id.entry(*chan_id) {
-																	hash_map::Entry::Occupied(prev_chan) =>
-																		(Some(chan_id.clone()), Some(prev_chan.get().get_user_id())),
-																	_ => (None, None),
-																}
-															} else {
-																(None, None)
-															};
+														let prev_channel_id = prev_funding_outpoint.to_channel_id();
+														let via_user_channel_id = channel_state.by_id.get(&prev_channel_id).map(|chan| chan.get_user_id());
 														new_events.push(events::Event::PaymentReceived {
 															payment_hash,
 															amount_msat: outgoing_amt_msat,
 															purpose,
-															via_channel_id,
+															via_channel_id: Some(prev_channel_id),
 															via_user_channel_id,
 														});
 													},