Skip to content

Commit 86d115c

Browse files
committed
f wrong msg len
1 parent 8e58fa5 commit 86d115c

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4620,24 +4620,25 @@ mod tests {
46204620
let secp_ctx = Secp256k1::new();
46214621
let key = SecretKey::from_slice(&[1; 32]).unwrap();
46224622
let msg = channel_announcement(&key, &key, ChannelFeatures::empty(), 42, &secp_ctx);
4623-
// The message bufer size is the message length plus two 16-byte MACs plus a 2-byte length.
4624-
let encoded_size = msg.encode().len() + 16 * 2 + 2;
4623+
// The message bufer size is the message length plus two 16-byte MACs plus a 2-byte length
4624+
// and 2-byte type.
4625+
let encoded_size = msg.serialized_length() + 16 * 2 + 2 + 2;
46254626
let msg_ev = MessageSendEvent::BroadcastChannelAnnouncement { msg, update_msg: None };
46264627

46274628
fd_a.hang_writes.store(true, Ordering::Relaxed);
46284629

46294630
// Now push an arbitrarily large number of messages and check that only
46304631
// `OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP` messages end up in the queue.
4631-
for _ in 0..OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP / encoded_size {
4632+
for i in 0..OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP / encoded_size {
46324633
cfgs[0].routing_handler.pending_events.lock().unwrap().push(msg_ev.clone());
46334634
peers[0].process_events();
46344635
}
46354636

46364637
{
46374638
let peer_a_lock = peers[0].peers.read().unwrap();
4638-
let peer_state_lock = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
4639-
let buf_len: usize =
4640-
peer_state_lock.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum();
4639+
let peer = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
4640+
let buf_len = peer.pending_outbound_buffer.iter().map(|m| m.capacity()).sum::<usize>()
4641+
+ peer.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum::<usize>();
46414642
assert!(buf_len > OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP - encoded_size);
46424643
assert!(buf_len < OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP);
46434644
}
@@ -4649,9 +4650,9 @@ mod tests {
46494650

46504651
{
46514652
let peer_a_lock = peers[0].peers.read().unwrap();
4652-
let peer_state_lock = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
4653-
let buf_len: usize =
4654-
peer_state_lock.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum();
4653+
let peer = peer_a_lock.get(&fd_a).unwrap().lock().unwrap();
4654+
let buf_len = peer.pending_outbound_buffer.iter().map(|m| m.capacity()).sum::<usize>()
4655+
+ peer.gossip_broadcast_buffer.iter().map(|m| m.capacity()).sum::<usize>();
46554656
assert!(buf_len > OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP);
46564657
assert!(buf_len < OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP + encoded_size);
46574658
}

0 commit comments

Comments
 (0)