f only set scid field if not InvalidRoute err

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -709,7 +709,7 @@ impl OutboundPayments {
 		let mut events = pending_events.lock().unwrap();
 		debug_assert_eq!(paths.len(), path_results.len());
 		for (path, path_res) in paths.into_iter().zip(path_results) {
-			if path_res.is_err() {
+			if let Err(e) = path_res {
 				let scid = path[0].short_channel_id;
 				events.push(events::Event::PaymentPathFailed {
 					payment_id: Some(payment_id),
@@ -718,7 +718,7 @@ impl OutboundPayments {
 					network_update: None,
 					all_paths_failed: false,
 					path,
-					short_channel_id: Some(scid),
+					short_channel_id: if let APIError::InvalidRoute { .. } = e { None } else { Some(scid) },
 					retry: None,
 					#[cfg(test)]
 					error_code: None,