Impl FromStr for NodeId

Author: benthecarman

lightning/src/routing/gossip.rs

@@ -38,12 +38,14 @@ use crate::io;
 use crate::io_extras::{copy, sink};
 use crate::prelude::*;
 use core::{cmp, fmt};
-use core::convert::TryFrom;
+use core::convert::{TryFrom, TryInto};
 use crate::sync::{RwLock, RwLockReadGuard};
 #[cfg(feature = "std")]
 use core::sync::atomic::{AtomicUsize, Ordering};
 use crate::sync::Mutex;
 use core::ops::{Bound, Deref};
+use core::str::FromStr;
+use hex::{decode, FromHexError};
 
 #[cfg(feature = "std")]
 use std::time::{SystemTime, UNIX_EPOCH};
@@ -149,6 +151,16 @@ impl TryFrom<NodeId> for PublicKey {
 	}
 }
 
+impl FromStr for NodeId {
+	type Err = FromHexError;
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		let bytes = decode(s)?;
+		let data: [u8; PUBLIC_KEY_SIZE] =
+			bytes[..].try_into().map_err(|_| FromHexError::InvalidStringLength)?;
+		Ok(NodeId(data))
+	}
+}
+
 /// Represents the network as nodes and channels between them
 pub struct NetworkGraph<L: Deref> where L::Target: Logger {
 	secp_ctx: Secp256k1<secp256k1::VerifyOnly>,