Add short_channel_id in ChannelInfo

Next commit expose publicly structure to allow displaying network
graph. Even if we already index by short_channel_id in NetworkMap,
an exposed identifier makes exposition more useful.

Author: Antoine Riard

lightning/src/ln/router.rs

@@ -123,6 +123,7 @@ impl_writeable!(DirectionalChannelInfo, 0, {
 
 #[derive(PartialEq)]
 struct ChannelInfo {
+	short_channel_id: u64,
 	features: ChannelFeatures,
 	one_to_two: DirectionalChannelInfo,
 	two_to_one: DirectionalChannelInfo,
@@ -133,12 +134,13 @@ struct ChannelInfo {
 
 impl std::fmt::Display for ChannelInfo {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		write!(f, "features: {}, one_to_two: {}, two_to_one: {}", log_bytes!(self.features.encode()), self.one_to_two, self.two_to_one)?;
+		write!(f, "short_channel_id: {}, features: {}, one_to_two: {}, two_to_one: {}", self.short_channel_id, log_bytes!(self.features.encode()), self.one_to_two, self.two_to_one)?;
 		Ok(())
 	}
 }
 
 impl_writeable!(ChannelInfo, 0, {
+	short_channel_id,
 	features,
 	one_to_two,
 	two_to_one,
@@ -485,6 +487,7 @@ impl RoutingMessageHandler for Router {
 		let should_relay = msg.contents.excess_data.is_empty();
 
 		let chan_info = ChannelInfo {
+				short_channel_id: msg.contents.short_channel_id,
 				features: msg.contents.features.clone(),
 				one_to_two: DirectionalChannelInfo {
 					src_node_id: msg.contents.node_id_1.clone(),