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

Drop support for creating BOLT 4 Legacy onion format payloads

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

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

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

diff --cc lightning/src/ln/onion_route_tests.rs
index 13bbe8cd166e0147a6b0bd2469517359633e232a,a26e68e728212054fafe3b67559e697063579b0f..b5c55ccf5ca0c60f945dc4b87c516c83ff27a6fa
--- 1/lightning/src/ln/onion_route_tests.rs
--- 2/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;

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

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