f - update old tests as creating legacy onions is dropped

Author: ViktorTigerstrom

lightning/src/ln/onion_route_tests.rs

@@ -19,7 +19,7 @@ use ln::channelmanager::{self, ChannelManager, ChannelManagerReadArgs, HTLCForwa
 use ln::onion_utils;
 use routing::gossip::{NetworkUpdate, RoutingFees, NodeId};
 use routing::router::{get_route, PaymentParameters, Route, RouteHint, RouteHintHop};
-use ln::features::{InitFeatures, InvoiceFeatures, NodeFeatures};
+use ln::features::InitFeatures;
 use ln::msgs;
 use ln::msgs::{ChannelMessageHandler, ChannelUpdate};
 use ln::wire::Encode;
@@ -791,10 +791,10 @@ fn test_onion_failure_stale_channel_update() {
 }
 
 #[test]
-fn test_default_to_onion_payload_tlv_format() {
-	// Tests that we default to creating tlv format onion payloads when no `NodeAnnouncementInfo`
-	// `features` for a node in the `network_graph` exists, or when the node isn't in the
-	// `network_graph`, and no other known `features` for the node exists.
+fn test_default_to_assume_support_of_variable_length_onions() {
+	// Tests that we default to assuming support of variable length onions when no
+	// `NodeAnnouncementInfo` `features` for a node in the `network_graph` exists, or when the node
+	// isn't in the `network_graph`, and no other known `features` for the node exists.
 	let mut priv_channels_conf = UserConfig::default();
 	priv_channels_conf.channel_handshake_config.announced_channel = false;
 	let chanmon_cfgs = create_chanmon_cfgs(5);
@@ -858,100 +858,6 @@ fn test_default_to_onion_payload_tlv_format() {
 	// and no `InvoiceFeatures` for the `payment_params` exists, which would otherwise have been
 	// used.
 	assert!(unannounced_chan_hop.node_features.supports_variable_length_onion());
-
-	let cur_height = nodes[0].best_block_info().1 + 1;
-	let (announced_route_payloads, _htlc_msat, _htlc_cltv) = onion_utils::build_onion_payloads(&announced_route.paths[0], 40000, &None, cur_height, &None).unwrap();
-	let (unannounced_route_paylods, _htlc_msat, _htlc_cltv) = onion_utils::build_onion_payloads(&unannounced_route.paths[0], 40000, &None, cur_height, &None).unwrap();
-
-	for onion_payloads in vec![announced_route_payloads, unannounced_route_paylods] {
-		for onion_payload in onion_payloads.iter() {
-			match onion_payload.format {
-				msgs::OnionHopDataFormat::Legacy {..} => {
-					panic!("Generated a `msgs::OnionHopDataFormat::Legacy` payload, even though that shouldn't have happend.");
-				}
-				_ => {}
-			}
-		}
-	}
-}
-
-#[test]
-fn test_do_not_default_to_onion_payload_tlv_format_when_unsupported() {
-	// Tests that we do not default to creating tlv onions if either of these types features
-	// exists, which specifies no support for variable length onions for a specific hop, when
-	// creating a route:
-	// 1. `InitFeatures` to the counterparty node exchanged with the init message to the node.
-	// 2. `NodeFeatures` in the `NodeAnnouncementInfo` of a node in sender node's `network_graph`.
-	// 3. `InvoiceFeatures` specified by the receiving node, when no `NodeAnnouncementInfo`
-	// `features` exists for the receiver in the sender's `network_graph`.
-	let chanmon_cfgs = create_chanmon_cfgs(4);
-	let mut node_cfgs = create_node_cfgs(4, &chanmon_cfgs);
-
-	// Set `node[1]` config to `InitFeatures::empty()` + `static_remote_key` which implies
-	// `!supports_variable_length_onion()` but still supports the required static-remote-key
-	// feature.
-	let mut node_1_cfg = &mut node_cfgs[1];
-	node_1_cfg.features = InitFeatures::empty();
-	node_1_cfg.features.set_static_remote_key_required();
-
-	let node_chanmgrs = create_node_chanmgrs(4, &node_cfgs, &[None, None, None, None]);
-	let mut nodes = create_network(4, &node_cfgs, &node_chanmgrs);
-
-	create_announced_chan_between_nodes(&nodes, 0, 1, channelmanager::provided_init_features(), channelmanager::provided_init_features());
-	create_announced_chan_between_nodes(&nodes, 1, 2, channelmanager::provided_init_features(), channelmanager::provided_init_features());
-	create_announced_chan_between_nodes(&nodes, 2, 3, channelmanager::provided_init_features(), channelmanager::provided_init_features());
-
-	let payment_params = PaymentParameters::from_node_id(nodes[3].node.get_our_node_id())
-		.with_features(InvoiceFeatures::empty());
-	let origin_node = &nodes[0];
-	let network_graph = origin_node.network_graph;
-	network_graph.clear_nodes_announcement_info();
-
-	// Set `NodeAnnouncementInfo` `features` which do not support variable length onions for
-	// `nodes[2]` in `nodes[0]`'s `network_graph`.
-	let nodes_2_unsigned_node_announcement = msgs::UnsignedNodeAnnouncement {
-		features: NodeFeatures::empty(),
-		timestamp: 0,
-		node_id: nodes[2].node.get_our_node_id(),
-		rgb: [32; 3],
-		alias: [16;32],
-		addresses: Vec::new(),
-		excess_address_data: Vec::new(),
-		excess_data: Vec::new(),
-	};
-	let _res = network_graph.update_node_from_unsigned_announcement(&nodes_2_unsigned_node_announcement);
-
-	let (route, _, _, _) = get_route_and_payment_hash!(
-		origin_node, nodes[3], payment_params, 10_000, TEST_FINAL_CLTV);
-
-	let hops = &route.paths[0];
-
-	// Assert that the hop between `nodes[0]` and `nodes[1]` doesn't support variable length
-	// onions, as as the `InitFeatures` exchanged (`InitFeatures::empty()`) in the init message
-	// between the nodes when setting up the channel is used when creating the `route` and that we
-	// therefore do not default to supporting variable length onions. Despite `nodes[0]` having no
-	// `NodeAnnouncementInfo` `features` for `node[1]`.
-	assert!(!hops[0].node_features.supports_variable_length_onion());
-	// Assert that the hop between `nodes[1]` and `nodes[2]` uses the `features` from
-	// `nodes_2_unsigned_node_announcement` that doesn't support variable length onions.
-	assert!(!hops[1].node_features.supports_variable_length_onion());
-	// Assert that the hop between `nodes[2]` and `nodes[3]` uses the `InvoiceFeatures` set to the
-	// `payment_params`, that doesn't support variable length onions. We therefore do not end up
-	// defaulting to supporting variable length onions, despite `nodes[0]` having no
-	// `NodeAnnouncementInfo` `features` for `node[3]`.
-	assert!(!hops[2].node_features.supports_variable_length_onion());
-
-	let cur_height = nodes[0].best_block_info().1 + 1;
-	let (onion_payloads, _htlc_msat, _htlc_cltv) = onion_utils::build_onion_payloads(&route.paths[0], 40000, &None, cur_height, &None).unwrap();
-
-	for onion_payload in onion_payloads.iter() {
-		match onion_payload.format {
-			msgs::OnionHopDataFormat::Legacy {..} => {}
-			_ => {
-				panic!("Should have only have generated `msgs::OnionHopDataFormat::Legacy` payloads");
-			}
-		}
-	}
 }
 
 macro_rules! get_phantom_route {