f simplify since we're touching

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -6929,10 +6929,8 @@ where
 		payment_info: Option<PaymentClaimDetails>, completion_action: ComplFunc,
 	) {
 		let counterparty_node_id = prev_hop.counterparty_node_id.or_else(|| {
-			match self.short_to_chan_info.read().unwrap().get(&prev_hop.short_channel_id) {
-				Some((cp_id, _dup_chan_id)) => Some(cp_id.clone()),
-				None => None
-			}
+			let short_to_chan_info = self.short_to_chan_info.read().unwrap();
+			short_to_chan_info.get(&prev_hop.short_channel_id).map(|(cp_id, _)| *cp_id)
 		});
 
 		let htlc_source = HTLCClaimSource {