f - cleanup test payment params initialization

Author: alecchendev

lightning/src/ln/functional_tests.rs

@@ -27,7 +27,7 @@ use crate::ln::{chan_utils, onion_utils};
 use crate::ln::chan_utils::{OFFERED_HTLC_SCRIPT_WEIGHT, htlc_success_tx_weight, htlc_timeout_tx_weight, HTLCOutputInCommitment};
 use crate::routing::gossip::{NetworkGraph, NetworkUpdate};
 use crate::routing::router::{Path, PaymentParameters, Route, RouteHop, RouteParameters, find_route, get_route};
-use crate::ln::features::{ChannelFeatures, NodeFeatures, InvoiceFeatures};
+use crate::ln::features::{ChannelFeatures, NodeFeatures};
 use crate::ln::msgs;
 use crate::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, ErrorAction};
 use crate::util::enforcing_trait_impls::EnforcingSigner;
@@ -8232,13 +8232,8 @@ fn do_test_mpp_keysend(accept_mpp_keysend: bool) {
 	let payer_pubkey = nodes[0].node.get_our_node_id();
 	let payee_pubkey = nodes[3].node.get_our_node_id();
 	let recv_value = 15_000_000;
-	let mut invoice_features = InvoiceFeatures::for_keysend(true);
-	invoice_features.set_basic_mpp_optional();
 	let route_params = RouteParameters {
-		payment_params: PaymentParameters::from_node_id(payee_pubkey, 40).with_bolt11_features(invoice_features).unwrap(),
-		// Approxiamating the amount to make the router use MPP is not reliable in
-		// case those thresholds change, but helpful to test where the router may
-		// block mpp keysend
+		payment_params: PaymentParameters::for_keysend(payee_pubkey, 40, true),
 		final_value_msat: recv_value,
 	};
 	let scorer = test_utils::TestScorer::new();