Skip to content

Commit 855e240

Browse files
committed
f rebase
1 parent efc74e4 commit 855e240

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

lightning/src/ln/functional_tests.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8035,8 +8035,10 @@ fn test_onion_value_mpp_set_calculation() {
80358035

80368036
// Send payment
80378037
let payment_id = PaymentId(nodes[0].keys_manager.backing.get_secure_random_bytes());
8038-
let onion_session_privs = nodes[0].node.test_add_new_pending_payment(our_payment_hash, Some(our_payment_secret), payment_id, &route).unwrap();
8039-
nodes[0].node.test_send_payment_internal(&route, our_payment_hash, &Some(our_payment_secret), None, payment_id, Some(total_msat), onion_session_privs).unwrap();
8038+
let onion_session_privs = nodes[0].node.test_add_new_pending_payment(our_payment_hash,
8039+
RecipientOnionFields::secret_only(our_payment_secret), payment_id, &route).unwrap();
8040+
nodes[0].node.test_send_payment_internal(&route, our_payment_hash,
8041+
RecipientOnionFields::secret_only(our_payment_secret), None, payment_id, Some(total_msat), onion_session_privs).unwrap();
80408042
check_added_monitors!(nodes[0], expected_paths.len());
80418043

80428044
let mut events = nodes[0].node.get_and_clear_pending_msg_events();
@@ -8055,7 +8057,8 @@ fn test_onion_value_mpp_set_calculation() {
80558057
let height = nodes[0].best_block_info().1;
80568058
let session_priv = SecretKey::from_slice(&session_priv).unwrap();
80578059
let mut onion_keys = onion_utils::construct_onion_keys(&Secp256k1::new(), &route.paths[0], &session_priv).unwrap();
8058-
let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000, &Some(our_payment_secret), height + 1, &None).unwrap();
8060+
let (mut onion_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], 100_000,
8061+
RecipientOnionFields::secret_only(our_payment_secret), height + 1, &None).unwrap();
80598062
// Edit amt_to_forward to simulate the sender having set
80608063
// the final amount and the routing node taking less fee
80618064
onion_payloads[1].amt_to_forward = 99_000;
@@ -8134,8 +8137,10 @@ fn do_test_overshoot_mpp(msat_amounts: &[u64], total_msat: u64) {
81348137

81358138
// Send payment with manually set total_msat
81368139
let payment_id = PaymentId(nodes[src_idx].keys_manager.backing.get_secure_random_bytes());
8137-
let onion_session_privs = nodes[src_idx].node.test_add_new_pending_payment(our_payment_hash, Some(our_payment_secret), payment_id, &route).unwrap();
8138-
nodes[src_idx].node.test_send_payment_internal(&route, our_payment_hash, &Some(our_payment_secret), None, payment_id, Some(total_msat), onion_session_privs).unwrap();
8140+
let onion_session_privs = nodes[src_idx].node.test_add_new_pending_payment(our_payment_hash,
8141+
RecipientOnionFields::secret_only(our_payment_secret), payment_id, &route).unwrap();
8142+
nodes[src_idx].node.test_send_payment_internal(&route, our_payment_hash,
8143+
RecipientOnionFields::secret_only(our_payment_secret), None, payment_id, Some(total_msat), onion_session_privs).unwrap();
81398144
check_added_monitors!(nodes[src_idx], expected_paths.len());
81408145

81418146
let mut events = nodes[src_idx].node.get_and_clear_pending_msg_events();

0 commit comments

Comments
 (0)