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

diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs
index 806aadd5..b169b356 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
@@ -870,6 +879,7 @@ impl ChannelInfo {
 	/// Returns a [`DirectedChannelInfo`] for the channel directed to the given `target` from a
 	/// returned `source`, or `None` if `target` is not one of the channel's counterparties.
 	pub fn as_directed_to(&self, target: &NodeId) -> Option<(DirectedChannelInfo, &NodeId)> {
+		if self.one_to_two.is_none() || self.two_to_one.is_none() { return None; }
 		let (direction, source, outbound) = {
 			if target == &self.node_one {
 				(self.two_to_one.as_ref(), &self.node_two, false)
@@ -879,12 +889,14 @@ impl ChannelInfo {
 				return None;
 			}
 		};
-		direction.map(|dir| (DirectedChannelInfo::new(self, dir, outbound), source))
+		let dir = direction.expect("We checked that both directions are available at the start");
+		Some((DirectedChannelInfo::new(self, dir, outbound), source))
 	}
 
 	/// Returns a [`DirectedChannelInfo`] for the channel directed from the given `source` to a
 	/// returned `target`, or `None` if `source` is not one of the channel's counterparties.
 	pub fn as_directed_from(&self, source: &NodeId) -> Option<(DirectedChannelInfo, &NodeId)> {
+		if self.one_to_two.is_none() || self.two_to_one.is_none() { return None; }
 		let (direction, target, outbound) = {
 			if source == &self.node_one {
 				(self.one_to_two.as_ref(), &self.node_two, true)
@@ -894,7 +906,8 @@ impl ChannelInfo {
 				return None;
 			}
 		};
-		direction.map(|dir| (DirectedChannelInfo::new(self, dir, outbound), target))
+		let dir = direction.expect("We checked that both directions are available at the start");
+		Some((DirectedChannelInfo::new(self, dir, outbound), target))
 	}
 
 	/// Returns a [`ChannelUpdateInfo`] based on the direction implied by the channel_flag.