f - Remove Legacy format enum fix

Author: ViktorT-11

lightning/src/ln/msgs.rs

@@ -42,7 +42,7 @@ use crate::io_extras::read_to_end;
 
 use crate::util::events::{MessageSendEventsProvider, OnionMessageProvider};
 use crate::util::logger;
-use crate::util::ser::{BigSize, LengthReadable, Readable, ReadableArgs, Writeable, Writer, FixedLengthReader, HighZeroBytesDroppedBigSize, Hostname};
+use crate::util::ser::{LengthReadable, Readable, ReadableArgs, Writeable, Writer, FixedLengthReader, HighZeroBytesDroppedBigSize, Hostname};
 
 use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 
@@ -1477,29 +1477,20 @@ impl Writeable for OnionHopData {
 
 impl Readable for OnionHopData {
 	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		let b: BigSize = Readable::read(r)?;
-		const LEGACY_ONION_HOP_FLAG: u64 = 0;
-		if b.0 == LEGACY_ONION_HOP_FLAG {
-			// Support for Legacy onion payload format has been removed as of LDK 0.XX,
-			// due to being deprecated in BOLT4.
-			return Err(DecodeError::InvalidValue);
-		}
-
-		let mut rd = FixedLengthReader::new(r, b.0);
 		let mut amt = HighZeroBytesDroppedBigSize(0u64);
 		let mut cltv_value = HighZeroBytesDroppedBigSize(0u32);
 		let mut short_id: Option<u64> = None;
 		let mut payment_data: Option<FinalOnionHopData> = None;
 		let mut keysend_preimage: Option<PaymentPreimage> = None;
-		decode_tlv_stream!(&mut rd, {
+		read_tlv_fields!(r, {
 			(2, amt, required),
 			(4, cltv_value, required),
 			(6, short_id, option),
 			(8, payment_data, option),
 			// See https://github.com/lightning/blips/blob/master/blip-0003.md
 			(5482373484, keysend_preimage, option)
 		});
-		rd.eat_remaining().map_err(|_| DecodeError::ShortRead)?;
+
 		let format = if let Some(short_channel_id) = short_id {
 			if payment_data.is_some() { return Err(DecodeError::InvalidValue); }
 			OnionHopDataFormat::NonFinalNode {