The NodeId is always available in the session info (#859)

substrate/core/network/src/protocol.rs

@@ -500,10 +500,8 @@ impl<B: BlockT, S: Specialization<B>, H: ExHashT> Protocol<B, S, H> {
 				.unzip();
 
 			if !to_send.is_empty() {
-				let node_id = io.peer_session_info(*who).map(|info| match info.id {
-					Some(id) => format!("{}@{:x}", info.remote_address, id),
-					None => info.remote_address.clone(),
-				});
+				let node_id = io.peer_session_info(*who)
+					.map(|info| format!("{}@{:?}", info.remote_address, info.id));
 
 				if let Some(id) = node_id {
 					for hash in hashes {

substrate/core/network/src/service.rs

@@ -21,7 +21,7 @@ use std::time::Duration;
 use futures::sync::{oneshot, mpsc};
 use network_libp2p::{NetworkProtocolHandler, NetworkContext, NodeIndex, ProtocolId,
 NetworkConfiguration , NonReservedPeerMode, ErrorKind};
-use network_libp2p::{NetworkService};
+use network_libp2p::{NetworkService, PeerId};
 use io::NetSyncIo;
 use protocol::{Protocol, ProtocolContext, Context, ProtocolStatus, PeerInfo as ProtocolPeerInfo};
 use config::{ProtocolConfig};
@@ -122,7 +122,7 @@ struct ProtocolHandler<B: BlockT, S: Specialization<B>, H: ExHashT> {
 #[derive(Debug)]
 pub struct PeerInfo<B: BlockT> {
 	/// Public node id
-	pub id: Option<String>,
+	pub id: PeerId,
 	/// Node client ID
 	pub client_version: String,
 	/// Capabilities
@@ -264,7 +264,7 @@ impl<B: BlockT + 'static, S: Specialization<B>, H: ExHashT> SyncProvider<B> for
 				};
 
 				Some(PeerInfo {
-					id: session_info.id.map(|id| format!("{:x}", id)),
+					id: session_info.id,
 					client_version: session_info.client_version,
 					capabilities: session_info.peer_capabilities.into_iter().map(|c| c.to_string()).collect(),
 					remote_address: session_info.remote_address,