X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fgossip.rs;h=db35ff01bf096184fd40ed61d16d38426d069809;hb=b8d4ac1371bf0db3b28339d4e12fadf02f6add3d;hp=806aadd583c02491df9b87b1076a4166b65d71c1;hpb=bf3bc420c7ff80f033f3a7871168e3b63ae34c1c;p=rust-lightning

diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs
index 806aadd5..db35ff01 100644
--- a/lightning/src/routing/gossip.rs
+++ b/lightning/src/routing/gossip.rs
@@ -21,7 +21,7 @@ use bitcoin::hashes::Hash;
 use bitcoin::network::constants::Network;
 
 use crate::events::{MessageSendEvent, MessageSendEventsProvider};
-use crate::ln::ChannelId;
+use crate::ln::types::ChannelId;
 use crate::ln::features::{ChannelFeatures, NodeFeatures, InitFeatures};
 use crate::ln::msgs::{DecodeError, ErrorAction, Init, LightningError, RoutingMessageHandler, SocketAddress, MAX_VALUE_MSAT};
 use crate::ln::msgs::{ChannelAnnouncement, ChannelUpdate, NodeAnnouncement, GossipTimestampFilter};
@@ -38,7 +38,6 @@ 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, LockTestExt};
 #[cfg(feature = "std")]
 use core::sync::atomic::{AtomicUsize, Ordering};
@@ -74,6 +73,16 @@ impl NodeId {
 		NodeId(pubkey.serialize())
 	}
 
+	/// Create a new NodeId from a slice of bytes
+	pub fn from_slice(bytes: &[u8]) -> Result<Self, DecodeError> {
+		if bytes.len() != PUBLIC_KEY_SIZE {
+			return Err(DecodeError::InvalidValue);
+		}
+		let mut data = [0; PUBLIC_KEY_SIZE];
+		data.copy_from_slice(bytes);
+		Ok(NodeId(data))
+	}
+
 	/// Get the public key slice from this NodeId
 	pub fn as_slice(&self) -> &[u8] {
 		&self.0