Merge pull request #2726 from shaavan/issue2712

[rust-lightning] / lightning / src / ln / blinded_payment_tests.rs

diff --git a/lightning/src/ln/blinded_payment_tests.rs b/lightning/src/ln/blinded_payment_tests.rs
index 826eaa86f48f1dd073a57d11dbb0831129b99e27..e8b6bfd679a43cbd7ec0eb51296d24a5c8dea2cc 100644 (file)
--- a/lightning/src/ln/blinded_payment_tests.rs
+++ b/lightning/src/ln/blinded_payment_tests.rs
@@ -13,7 +13,6 @@ use crate::blinded_path::payment::{PaymentConstraints, ReceiveTlvs};
 use crate::events::MessageSendEventsProvider;
 use crate::ln::channelmanager;
 use crate::ln::channelmanager::{PaymentId, RecipientOnionFields};
-use crate::ln::features::Bolt12InvoiceFeatures;
 use crate::ln::functional_test_utils::*;
 use crate::ln::outbound_payment::Retry;
 use crate::prelude::*;
@@ -47,10 +46,10 @@ fn do_one_hop_blinded_path(success: bool) {
                nodes[1].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[1].keys_manager, &secp_ctx
        ).unwrap();
 
-       let route_params = RouteParameters {
-               payment_params: PaymentParameters::blinded(vec![blinded_path]),
-               final_value_msat: amt_msat
-       };
+       let route_params = RouteParameters::from_payment_params_and_value(
+               PaymentParameters::blinded(vec![blinded_path]),
+               amt_msat,
+       );
        nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(),
        PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
        check_added_monitors(&nodes[0], 1);
@@ -88,13 +87,12 @@ fn mpp_to_one_hop_blinded_path() {
                nodes[3].node.get_our_node_id(), payee_tlvs, &chanmon_cfgs[3].keys_manager, &secp_ctx
        ).unwrap();
 
-       let bolt12_features: Bolt12InvoiceFeatures =
-               channelmanager::provided_invoice_features(&UserConfig::default()).to_context();
-       let route_params = RouteParameters {
-               payment_params: PaymentParameters::blinded(vec![blinded_path])
-                       .with_bolt12_features(bolt12_features).unwrap(),
-               final_value_msat: amt_msat,
-       };
+       let bolt12_features =
+               channelmanager::provided_bolt12_invoice_features(&UserConfig::default());
+       let route_params = RouteParameters::from_payment_params_and_value(
+               PaymentParameters::blinded(vec![blinded_path]).with_bolt12_features(bolt12_features).unwrap(),
+               amt_msat,
+       );
        nodes[0].node.send_payment(payment_hash, RecipientOnionFields::spontaneous_empty(), PaymentId(payment_hash.0), route_params, Retry::Attempts(0)).unwrap();
        check_added_monitors(&nodes[0], 2);