X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fevents%2Fmod.rs;h=a40a09fe512f4b25ca5ca530c909021adee9df7b;hb=cf64e3fba52d7b7f6abce352948d78b97bcb9700;hp=d0a7bc57a784f198c61a42b1955b5709649df6aa;hpb=4bd4f02fa7f60a5e90e5c016773afaec51f99746;p=rust-lightning

diff --git a/lightning/src/events/mod.rs b/lightning/src/events/mod.rs
index d0a7bc57..a40a09fe 100644
--- a/lightning/src/events/mod.rs
+++ b/lightning/src/events/mod.rs
@@ -821,12 +821,12 @@ pub enum Event {
 		user_channel_id: u128,
 		/// The reason the channel was closed.
 		reason: ClosureReason,
-		/// Counterparty in the closed channel. 
-		/// 
+		/// Counterparty in the closed channel.
+		///
 		/// This field will be `None` for objects serialized prior to LDK 0.0.117.
 		counterparty_node_id: Option<PublicKey>,
-		/// Channel capacity of the closing channel (sats). 
-		/// 
+		/// Channel capacity of the closing channel (sats).
+		///
 		/// This field will be `None` for objects serialized prior to LDK 0.0.117.
 		channel_capacity_sats: Option<u64>,
 	},
@@ -1030,8 +1030,8 @@ impl Writeable for Event {
 					(5, outbound_amount_forwarded_msat, option),
 				});
 			},
-			&Event::ChannelClosed { ref channel_id, ref user_channel_id, ref reason, 
-				ref counterparty_node_id, ref channel_capacity_sats 
+			&Event::ChannelClosed { ref channel_id, ref user_channel_id, ref reason,
+				ref counterparty_node_id, ref channel_capacity_sats
 			} => {
 				9u8.write(writer)?;
 				// `user_channel_id` used to be a single u64 value. In order to remain backwards
@@ -1368,7 +1368,7 @@ impl MaybeReadable for Event {
 			},
 			13u8 => {
 				let f = || {
-					_init_and_read_tlv_fields!(reader, {
+					_init_and_read_len_prefixed_tlv_fields!(reader, {
 						(0, payment_id, required),
 						(2, payment_hash, option),
 						(4, path, required_vec),
@@ -1433,7 +1433,7 @@ impl MaybeReadable for Event {
 			},
 			21u8 => {
 				let f = || {
-					_init_and_read_tlv_fields!(reader, {
+					_init_and_read_len_prefixed_tlv_fields!(reader, {
 						(0, payment_id, required),
 						(2, payment_hash, required),
 						(4, path, required_vec),
@@ -1449,7 +1449,7 @@ impl MaybeReadable for Event {
 			},
 			23u8 => {
 				let f = || {
-					_init_and_read_tlv_fields!(reader, {
+					_init_and_read_len_prefixed_tlv_fields!(reader, {
 						(0, payment_id, required),
 						(2, payment_hash, required),
 						(4, path, required_vec),
@@ -1551,6 +1551,7 @@ impl MaybeReadable for Event {
 /// broadcast to most peers).
 /// These events are handled by PeerManager::process_events if you are using a PeerManager.
 #[derive(Clone, Debug)]
+#[cfg_attr(test, derive(PartialEq))]
 pub enum MessageSendEvent {
 	/// Used to indicate that we've accepted a channel open and should send the accept_channel
 	/// message provided to the given peer.