@@ -4620,24 +4620,25 @@ mod tests {
4620
4620
let secp_ctx = Secp256k1 :: new ( ) ;
4621
4621
let key = SecretKey :: from_slice ( & [ 1 ; 32 ] ) . unwrap ( ) ;
4622
4622
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 ;
4625
4626
let msg_ev = MessageSendEvent :: BroadcastChannelAnnouncement { msg, update_msg : None } ;
4626
4627
4627
4628
fd_a. hang_writes . store ( true , Ordering :: Relaxed ) ;
4628
4629
4629
4630
// Now push an arbitrarily large number of messages and check that only
4630
4631
// `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 {
4632
4633
cfgs[ 0 ] . routing_handler . pending_events . lock ( ) . unwrap ( ) . push ( msg_ev. clone ( ) ) ;
4633
4634
peers[ 0 ] . process_events ( ) ;
4634
4635
}
4635
4636
4636
4637
{
4637
4638
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 > ( ) ;
4641
4642
assert ! ( buf_len > OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP - encoded_size) ;
4642
4643
assert ! ( buf_len < OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP ) ;
4643
4644
}
@@ -4649,9 +4650,9 @@ mod tests {
4649
4650
4650
4651
{
4651
4652
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 > ( ) ;
4655
4656
assert ! ( buf_len > OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP ) ;
4656
4657
assert ! ( buf_len < OUTBOUND_BUFFER_SIZE_LIMIT_DROP_GOSSIP + encoded_size) ;
4657
4658
}
0 commit comments