Merge pull request #3142 from TheBlueMatt/2024-06-robust-updates

Reliably deliver gossip messages from our `ChannelMessageHandler`

diff --cc lightning/src/ln/peer_handler.rs
index 8f88c4f689b7101964d7400ad98fd7412ba25483,a4cf2f26ee4f8c3235329f7a0e1268650ed96c8b..b5fc3443be5b16e7f898719c3650eb1c1ada02bb
--- 1/lightning/src/ln/peer_handler.rs
--- 2/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@@ -2712,9 -2735,8 +2744,8 @@@ mod tests 
        use crate::events;
        use crate::io;
        use crate::ln::types::ChannelId;
 -      use crate::ln::features::{InitFeatures, NodeFeatures};
 +      use crate::types::features::{InitFeatures, NodeFeatures};
        use crate::ln::peer_channel_encryptor::PeerChannelEncryptor;
-       use crate::ln::peer_handler::{CustomMessageHandler, PeerManager, MessageHandler, SocketDescriptor, IgnoringMessageHandler, filter_addresses, ErroringMessageHandler, MAX_BUFFER_DRAIN_TICK_INTERVALS_PER_PEER};
        use crate::ln::{msgs, wire};
        use crate::ln::msgs::{Init, LightningError, SocketAddress};
        use crate::util::test_utils;

diff --cc lightning/src/routing/test_utils.rs
Simple merge

diff --cc lightning/src/util/test_utils.rs
Simple merge