X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fmsgs.rs;h=1d0ea1c637235c02774fe3e111238c6a25ed15d4;hb=3b498378620d4294f188804c97497112e3693297;hp=072383c11cab4a1670e0dfe322a0315d5daebe1c;hpb=faff5c2da3d75783a9141ad3cf74011d2d7f9126;p=rust-lightning

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 072383c1..1d0ea1c6 100644
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -462,11 +462,11 @@ pub trait ChannelMessageHandler : events::EventsProvider + Send + Sync {
 }
 
 pub trait RoutingMessageHandler : Send + Sync {
-	fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<(), HandleError>;
+	fn handle_node_announcement(&self, msg: &NodeAnnouncement) -> Result<bool, HandleError>;
 	/// Handle a channel_announcement message, returning true if it should be forwarded on, false
 	/// or returning an Err otherwise.
 	fn handle_channel_announcement(&self, msg: &ChannelAnnouncement) -> Result<bool, HandleError>;
-	fn handle_channel_update(&self, msg: &ChannelUpdate) -> Result<(), HandleError>;
+	fn handle_channel_update(&self, msg: &ChannelUpdate) -> Result<bool, HandleError>;
 	fn handle_htlc_fail_channel_update(&self, update: &HTLCFailChannelUpdate);
 }
 
@@ -681,10 +681,11 @@ impl MsgDecodable for OpenChannel {
 			}
 			shutdown_scriptpubkey = Some(Script::from(v[321..321+len].to_vec()));
 		}
-
+		let mut temp_channel_id = [0; 32];
+		temp_channel_id[..].copy_from_slice(&v[32..64]);
 		Ok(OpenChannel {
 			chain_hash: deserialize(&v[0..32]).unwrap(),
-			temporary_channel_id: deserialize(&v[32..64]).unwrap(),
+			temporary_channel_id: temp_channel_id,
 			funding_satoshis: byte_utils::slice_to_be64(&v[64..72]),
 			push_msat: byte_utils::slice_to_be64(&v[72..80]),
 			dust_limit_satoshis: byte_utils::slice_to_be64(&v[80..88]),