From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 11 Nov 2022 00:49:45 +0000 (+0000)
Subject: Merge pull request #1413 from ViktorTigerstrom/2022-04-default-to-bolt4-tlv-onions
X-Git-Tag: v0.0.113~44
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=593d8c4610f082441563d4906d64175a354b1cfc;p=rust-lightning

Merge pull request #1413 from ViktorTigerstrom/2022-04-default-to-bolt4-tlv-onions

Drop support for creating BOLT 4 Legacy onion format payloads
---

593d8c4610f082441563d4906d64175a354b1cfc
diff --cc lightning/src/ln/onion_route_tests.rs
index 13bbe8cd1,a26e68e72..b5c55ccf5
--- a/lightning/src/ln/onion_route_tests.rs
+++ b/lightning/src/ln/onion_route_tests.rs
@@@ -15,11 -15,11 +15,11 @@@ use crate::chain::channelmonitor::{Chan
  use crate::chain::keysinterface::{KeysInterface, Recipient};
  use crate::ln::{PaymentHash, PaymentSecret};
  use crate::ln::channel::EXPIRE_PREV_CONFIG_TICKS;
 -use crate::ln::channelmanager::{self, ChannelManager, ChannelManagerReadArgs, HTLCForwardInfo, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingHTLCInfo, PendingHTLCRouting};
 +use crate::ln::channelmanager::{self, ChannelManager, ChannelManagerReadArgs, HTLCForwardInfo, CLTV_FAR_FAR_AWAY, MIN_CLTV_EXPIRY_DELTA, PendingAddHTLCInfo, PendingHTLCInfo, PendingHTLCRouting, PaymentId};
  use crate::ln::onion_utils;
- use crate::routing::gossip::{NetworkUpdate, RoutingFees, NodeId};
+ use crate::routing::gossip::{NetworkUpdate, RoutingFees};
  use crate::routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
- use crate::ln::features::{InitFeatures, InvoiceFeatures, NodeFeatures};
+ use crate::ln::features::{InitFeatures, InvoiceFeatures};
  use crate::ln::msgs;
  use crate::ln::msgs::{ChannelMessageHandler, ChannelUpdate};
  use crate::ln::wire::Encode;