X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fpeer_handler.rs;h=e6a06b56e9598b25958729a2bd974583ffef6cee;hb=f60da31e56cab7713119be1658d4204b054a30d2;hp=1d164e6e684ad153e4229b016a9e5920db153430;hpb=2e5e40e0b21fbac862478dce4d81cf037f37060d;p=rust-lightning

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 1d164e6e..e6a06b56 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -24,7 +24,6 @@ use ln::channelmanager::{SimpleArcChannelManager, SimpleRefChannelManager};
 use util::ser::{VecWriter, Writeable, Writer};
 use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
 use ln::wire;
-use ln::wire::MessageType;
 use util::byte_utils;
 use util::events::{MessageSendEvent, MessageSendEventsProvider};
 use util::logger::Logger;
@@ -83,7 +82,7 @@ impl Deref for IgnoringMessageHandler {
 }
 
 impl wire::Type for () {
-	fn type_id(&self) -> MessageType {
+	fn type_id(&self) -> u16 {
 		// We should never call this for `DummyCustomType`
 		unreachable!();
 	}
@@ -722,7 +721,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 
 	/// Append a message to a peer's pending outbound/write buffer, and update the map of peers needing sends accordingly.
 	fn enqueue_message<M: wire::Type + Writeable + Debug>(&self, peer: &mut Peer, message: &M) {
-		let mut buffer = VecWriter(Vec::new());
+		let mut buffer = VecWriter(Vec::with_capacity(2048));
 		wire::write(message, &mut buffer).unwrap(); // crash if the write failed
 		let encoded_message = buffer.0;
 
@@ -785,7 +784,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 												},
 											}
 										}
-									};
+									}
 								}
 							}
 
@@ -1079,13 +1078,13 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 			},
 
 			// Unknown messages:
-			wire::Message::Unknown(msg_type) if msg_type.is_even() => {
-				log_debug!(self.logger, "Received unknown even message of type {}, disconnecting peer!", msg_type);
+			wire::Message::Unknown(type_id) if message.is_even() => {
+				log_debug!(self.logger, "Received unknown even message of type {}, disconnecting peer!", type_id);
 				// Fail the channel if message is an even, unknown type as per BOLT #1.
 				return Err(PeerHandleError{ no_connection_possible: true }.into());
 			},
-			wire::Message::Unknown(msg_type) => {
-				log_trace!(self.logger, "Received unknown odd message of type {}, ignoring", msg_type);
+			wire::Message::Unknown(type_id) => {
+				log_trace!(self.logger, "Received unknown odd message of type {}, ignoring", type_id);
 			},
 			wire::Message::Custom(custom) => {
 				self.custom_message_handler.handle_custom_message(custom)?;