Refactor event read and write to use odd type

Author: 1nF0rmed

lightning/src/util/events.rs

@@ -350,7 +350,7 @@ impl Writeable for Event {
 				});
 			},
 			&Event::DiscardFunding { ref channel_id, ref transaction } => {
-				12u8.write(writer)?;
+				11u8.write(writer)?;
 				write_tlv_fields!(writer, {
 					(0, channel_id, required),
 					(2, transaction, option)
@@ -487,6 +487,16 @@ impl MaybeReadable for Event {
 				if reason.is_none() { return Ok(None); }
 				Ok(Some(Event::ChannelClosed { channel_id, reason: reason.unwrap() }))
 			},
+			11u8 => {
+				let mut channel_id = [0; 32];
+				let mut transaction = None;
+				read_tlv_fields!(reader, {
+					(0, channel_id, required),
+					(2, transaction, ignorable),
+				});
+				if transaction.is_none() { return Ok(None); }
+				Ok(Some(Event::DiscardFunding { channel_id, transaction } ))
+			},
 			// Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 			// Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 			// reads.