f wrong msg len

Author: TheBlueMatt

lightning/src/ln/peer_handler.rs

@@ -4694,24 +4694,25 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
 		let key = SecretKey::from_slice(&[1; 32]).unwrap();
 		let msg = channel_announcement(&key, &key, ChannelFeatures::empty(), 42, &secp_ctx);
-		// The message bufer size is the message length plus two 16-byte MACs plus a 2-byte length.
-		let encoded_size = msg.encode().len() + 16 * 2 + 2;
+		// The message bufer size is the message length plus two 16-byte MACs plus a 2-byte length
+		// and 2-byte type.
+		let encoded_size = msg.serialized_length() + 16 * 2 + 2 + 2;
 		let msg_ev = MessageSendEvent::BroadcastChannelAnnouncement { msg, update_msg: None };
 
 		fd_a.hang_writes.store(true, Ordering::Relaxed);
 
 		// Now push an arbitrarily large number of messages and check that only
 		// `OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP` messages end up in the queue.
-		for _ in 0..OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP / encoded_size {
+		for i in 0..OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP / encoded_size {
 			cfgs[0].routing_handler.pending_events.lock().unwrap().push(msg_ev.clone());
 			peers[0].process_events();
 		}
 
 		{
 			let peer_a_lock = peers[0].peers.read().unwrap();
-			let peer_state_lock = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
-			let buf_len: usize =
-				peer_state_lock.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum();
+			let peer = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
+			let buf_len = peer.pending_outbound_buffer.iter().map(|m| m.capacity()).sum::<usize>()
+				+ peer.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum::<usize>();
 			assert!(buf_len > OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP - encoded_size);
 			assert!(buf_len < OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP);
 		}
@@ -4723,9 +4724,9 @@ mod tests {
 
 		{
 			let peer_a_lock = peers[0].peers.read().unwrap();
-			let peer_state_lock = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
-			let buf_len: usize =
-				peer_state_lock.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum();
+			let peer = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
+			let buf_len = peer.pending_outbound_buffer.iter().map(|m| m.capacity()).sum::<usize>()
+				+ peer.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum::<usize>();
 			assert!(buf_len > OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP);
 			assert!(buf_len < OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP + encoded_size);
 		}