Impl FromStr for NodeId

Author: benthecarman

lightning/src/routing/gossip.rs

@@ -38,11 +38,13 @@ use crate::io;
 use crate::io_extras::{copy, sink};
 use crate::prelude::*;
 use core::{cmp, fmt};
+use core::convert::TryFrom;
 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;
 
 #[cfg(feature = "std")]
 use std::time::{SystemTime, UNIX_EPOCH};
@@ -136,9 +138,19 @@ impl From<PublicKey> for NodeId {
 	}
 }
 
-impl From<NodeId> for PublicKey {
-	fn from(node_id: NodeId) -> PublicKey {
-		PublicKey::from_slice( &node_id.0).unwrap()
+impl TryFrom<NodeId> for PublicKey {
+	type Error = secp256k1::Error;
+
+	fn try_from(node_id: NodeId) -> Result<Self, Self::Error> {
+		PublicKey::from_slice(&node_id.0)
+	}
+}
+
+impl FromStr for NodeId {
+	type Err = secp256k1::Error;
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		let pubkey = PublicKey::from_str(s)?;
+		Ok(NodeId::from_pubkey(&pubkey))
 	}
 }