Merge pull request #2146 from valentinewallace/2023-03-blinded-pathfinding-groundwork

Blinded pathfinding groundwork

diff --cc fuzz/src/chanmon_consistency.rs
Simple merge

diff --cc lightning-background-processor/src/lib.rs
Simple merge

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

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

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

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

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

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

diff --cc lightning/src/offers/invoice.rs
index 6bf155a230324a48c29c5b5c5d0b9cb06ed04a97,d432e2e139cb89cdd384b74be3142c0c543d0eba..05b2b5d010ec7a8cf36306f95ce481d6c148dd58
--- 1/lightning/src/offers/invoice.rs
--- 2/lightning/src/offers/invoice.rs
+++ b/lightning/src/offers/invoice.rs
@@@ -115,9 -116,7 +116,8 @@@ use crate::offers::parse::{ParseError, 
  use crate::offers::payer::{PAYER_METADATA_TYPE, PayerTlvStream, PayerTlvStreamRef};
  use crate::offers::refund::{IV_BYTES as REFUND_IV_BYTES, Refund, RefundContents};
  use crate::offers::signer;
- use crate::onion_message::BlindedPath;
  use crate::util::ser::{HighZeroBytesDroppedBigSize, Iterable, SeekReadable, WithoutLength, Writeable, Writer};
 +use crate::util::string::PrintableString;
  
  use crate::prelude::*;
  
@@@ -953,9 -938,7 +954,8 @@@ mod tests 
        use crate::offers::payer::PayerTlvStreamRef;
        use crate::offers::refund::RefundBuilder;
        use crate::offers::test_utils::*;
-       use crate::onion_message::{BlindedHop, BlindedPath};
        use crate::util::ser::{BigSize, Iterable, Writeable};
 +      use crate::util::string::PrintableString;
  
        trait ToBytes {
                fn to_bytes(&self) -> Vec<u8>;

diff --cc lightning/src/offers/offer.rs
Simple merge

diff --cc lightning/src/offers/refund.rs
Simple merge

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