Use CollectionLength for the persisted event queue length

src/event.rs

@@ -30,7 +30,7 @@ use lightning::sign::EntropySource;
 use lightning::util::config::{ChannelConfigOverrides, ChannelConfigUpdate};
 use lightning::util::errors::APIError;
 use lightning::util::persist::KVStore;
-use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
+use lightning::util::ser::{CollectionLength, Readable, ReadableArgs, Writeable, Writer};
 use lightning::{impl_writeable_tlv_based, impl_writeable_tlv_based_enum};
 use lightning_liquidity::lsps2::utils::compute_opening_fee;
 use lightning_types::payment::{PaymentHash, PaymentPreimage};
@@ -510,9 +510,10 @@ impl Readable for EventQueueDeserWrapper {
 	fn read<R: lightning::io::Read>(
 		reader: &mut R,
 	) -> Result<Self, lightning::ln::msgs::DecodeError> {
-		let len: u16 = Readable::read(reader)?;
-		let mut queue = VecDeque::with_capacity(len as usize);
-		for _ in 0..len {
+		let len: CollectionLength = Readable::read(reader)?;
+		// Bound the preallocation, as the length is read from persisted data.
+		let mut queue = VecDeque::with_capacity(core::cmp::min(len.0, 1024) as usize);
+		for _ in 0..len.0 {
 			queue.push_back(Readable::read(reader)?);
 		}
 		Ok(Self(queue))
@@ -523,7 +524,7 @@ struct EventQueueSerWrapper<'a>(&'a VecDeque<Event>);
 
 impl Writeable for EventQueueSerWrapper<'_> {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), lightning::io::Error> {
-		(self.0.len() as u16).write(writer)?;
+		CollectionLength(self.0.len() as u64).write(writer)?;
 		for e in self.0.iter() {
 			e.write(writer)?;
 		}
@@ -2635,4 +2636,42 @@ mod tests {
 		}
 		assert_eq!(event_queue.next_event(), None);
 	}
+
+	fn test_event_queue(len: usize) -> VecDeque<Event> {
+		(0..len)
+			.map(|i| Event::ChannelReady {
+				channel_id: ChannelId([23u8; 32]),
+				user_channel_id: UserChannelId(i as u128),
+				counterparty_node_id: None,
+				funding_txo: None,
+			})
+			.collect()
+	}
+
+	#[test]
+	fn event_queue_round_trips_around_u16_max() {
+		for len in [65_534, 65_535, 65_536, 65_540] {
+			let queue = test_event_queue(len);
+			let bytes = EventQueueSerWrapper(&queue).encode();
+			let read_queue: EventQueueDeserWrapper = Readable::read(&mut &bytes[..]).unwrap();
+			assert_eq!(read_queue.0.len(), len);
+			assert_eq!(read_queue.0, queue);
+		}
+	}
+
+	#[test]
+	fn event_queue_keeps_legacy_encoding_below_u16_max() {
+		let queue = test_event_queue(3);
+
+		// Before `CollectionLength`, the count was written as a plain `u16`.
+		let mut legacy_bytes = Vec::new();
+		(queue.len() as u16).write(&mut legacy_bytes).unwrap();
+		for event in queue.iter() {
+			event.write(&mut legacy_bytes).unwrap();
+		}
+
+		assert_eq!(EventQueueSerWrapper(&queue).encode(), legacy_bytes);
+		let read_queue: EventQueueDeserWrapper = Readable::read(&mut &legacy_bytes[..]).unwrap();
+		assert_eq!(read_queue.0, queue);
+	}
 }