X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=07293a102ea2ea7df99b9a1514c875b4cd98976f;hb=66784e32fe454e9a5b2080b85fc4d8816ac5e436;hp=40b73c3bd5f526c87e4ffc8d5a62a19456a4b80a;hpb=86641ea68062388a01c99c6ed131f56477c8e464;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 40b73c3b..07293a10 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -4382,37 +4382,11 @@ fn is_unsupported_shutdown_script(their_features: &InitFeatures, script: &Script
 const SERIALIZATION_VERSION: u8 = 1;
 const MIN_SERIALIZATION_VERSION: u8 = 1;
 
-impl Writeable for InboundHTLCRemovalReason {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		match self {
-			&InboundHTLCRemovalReason::FailRelay(ref error_packet) => {
-				0u8.write(writer)?;
-				error_packet.write(writer)?;
-			},
-			&InboundHTLCRemovalReason::FailMalformed((ref onion_hash, ref err_code)) => {
-				1u8.write(writer)?;
-				onion_hash.write(writer)?;
-				err_code.write(writer)?;
-			},
-			&InboundHTLCRemovalReason::Fulfill(ref payment_preimage) => {
-				2u8.write(writer)?;
-				payment_preimage.write(writer)?;
-			},
-		}
-		Ok(())
-	}
-}
-
-impl Readable for InboundHTLCRemovalReason {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
-		Ok(match <u8 as Readable>::read(reader)? {
-			0 => InboundHTLCRemovalReason::FailRelay(Readable::read(reader)?),
-			1 => InboundHTLCRemovalReason::FailMalformed((Readable::read(reader)?, Readable::read(reader)?)),
-			2 => InboundHTLCRemovalReason::Fulfill(Readable::read(reader)?),
-			_ => return Err(DecodeError::InvalidValue),
-		})
-	}
-}
+impl_writeable_tlv_based_enum!(InboundHTLCRemovalReason,;
+	(0, FailRelay),
+	(1, FailMalformed),
+	(2, Fulfill),
+);
 
 impl Writeable for ChannelUpdateStatus {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {