Merge pull request #3083 from valentinewallace/2024-05-ignore-onion-err-chan-upd

Ignore channel updates in onion errors

diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge

diff --cc lightning/src/routing/gossip.rs
index 25ee1b97ffd9d23d042b3e8ccc2460b08d7f4f81,e76c12e3eacc2df23837e82ae178d018f73297d1..c7908d0040c1283347155b32ee7bcd95d8db0720
--- 1/lightning/src/routing/gossip.rs
--- 2/lightning/src/routing/gossip.rs
+++ b/lightning/src/routing/gossip.rs
@@@ -9,31 -9,30 +9,31 @@@
  
  //! The [`NetworkGraph`] stores the network gossip and [`P2PGossipSync`] fetches it from peers
  
 +use bitcoin::amount::Amount;
  use bitcoin::blockdata::constants::ChainHash;
  
+ use bitcoin::secp256k1;
  use bitcoin::secp256k1::constants::PUBLIC_KEY_SIZE;
- use bitcoin::secp256k1::{PublicKey, Verification};
  use bitcoin::secp256k1::Secp256k1;
- use bitcoin::secp256k1;
+ use bitcoin::secp256k1::{PublicKey, Verification};
  
  use bitcoin::hashes::sha256d::Hash as Sha256dHash;
  use bitcoin::hashes::Hash;
 -use bitcoin::network::constants::Network;
 +use bitcoin::network::Network;
  
  use crate::events::{MessageSendEvent, MessageSendEventsProvider};
- use crate::ln::types::ChannelId;
- use crate::ln::features::{ChannelFeatures, NodeFeatures, InitFeatures};
- use crate::ln::msgs::{DecodeError, ErrorAction, Init, LightningError, RoutingMessageHandler, SocketAddress, MAX_VALUE_MSAT};
- use crate::ln::msgs::{ChannelAnnouncement, ChannelUpdate, NodeAnnouncement, GossipTimestampFilter};
- use crate::ln::msgs::{QueryChannelRange, ReplyChannelRange, QueryShortChannelIds, ReplyShortChannelIdsEnd};
+ use crate::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
  use crate::ln::msgs;
+ use crate::ln::msgs::{ChannelAnnouncement, ChannelUpdate, GossipTimestampFilter, NodeAnnouncement};
+ use crate::ln::msgs::{DecodeError, ErrorAction, Init, LightningError, RoutingMessageHandler, SocketAddress, MAX_VALUE_MSAT};
+ use crate::ln::msgs::{QueryChannelRange, QueryShortChannelIds, ReplyChannelRange, ReplyShortChannelIdsEnd};
+ use crate::ln::types::ChannelId;
  use crate::routing::utxo::{self, UtxoLookup, UtxoResolver};
- use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer, MaybeReadable};
- use crate::util::logger::{Logger, Level};
+ use crate::util::indexed_map::{Entry as IndexedMapEntry, IndexedMap};
+ use crate::util::logger::{Level, Logger};
  use crate::util::scid_utils::{block_from_scid, scid_from_parts, MAX_SCID_BLOCK};
+ use crate::util::ser::{MaybeReadable, Readable, ReadableArgs, RequiredWrapper, Writeable, Writer};
  use crate::util::string::PrintableString;
- use crate::util::indexed_map::{IndexedMap, Entry as IndexedMapEntry};
  
  use crate::io;
  use crate::io_extras::{copy, sink};