From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Mon, 24 Apr 2023 16:46:15 +0000 (+0000)
Subject: Merge pull request #2146 from valentinewallace/2023-03-blinded-pathfinding-groundwork
X-Git-Tag: v0.0.115~5
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=607727fae793e86f23249afddb0c10018312607f;p=rust-lightning

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

Blinded pathfinding groundwork
---

607727fae793e86f23249afddb0c10018312607f
diff --cc lightning/src/offers/invoice.rs
index 6bf155a23,d432e2e13..05b2b5d01
--- a/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>;