Skip to content

Commit d903f69

Browse files
committed
f move unwrap removals up
1 parent 3cba5f6 commit d903f69

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

lightning/src/ln/blinded_payment_tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,7 +2100,7 @@ fn do_test_trampoline_single_hop_receive(success: bool) {
21002100
// pop the last dummy hop
21012101
trampoline_payloads.pop();
21022102

2103-
let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key).unwrap();
2103+
let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key);
21042104
let trampoline_packet = onion_utils::construct_trampoline_onion_packet(
21052105
trampoline_payloads,
21062106
trampoline_onion_keys,
@@ -2112,7 +2112,7 @@ fn do_test_trampoline_single_hop_receive(success: bool) {
21122112
let outer_session_priv = secret_from_hex("e52c20461ed7acd46c4e7b591a37610519179482887bd73bf3b94617f8f03677");
21132113

21142114
let (outer_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], outer_total_msat, &recipient_onion_fields, outer_starting_htlc_offset, &None, None, Some(trampoline_packet)).unwrap();
2115-
let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv).unwrap();
2115+
let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv);
21162116
let outer_packet = onion_utils::construct_onion_packet(
21172117
outer_payloads,
21182118
outer_onion_keys,
@@ -2294,7 +2294,7 @@ fn test_trampoline_unblinded_receive() {
22942294
cltv_expiry_height: 104,
22952295
});
22962296

2297-
let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key).unwrap();
2297+
let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key);
22982298
let trampoline_packet = onion_utils::construct_trampoline_onion_packet(
22992299
trampoline_payloads,
23002300
trampoline_onion_keys,
@@ -2306,7 +2306,7 @@ fn test_trampoline_unblinded_receive() {
23062306
let outer_session_priv = secret_from_hex("e52c20461ed7acd46c4e7b591a37610519179482887bd73bf3b94617f8f03677");
23072307

23082308
let (outer_payloads, _, _) = onion_utils::build_onion_payloads(&route.paths[0], outer_total_msat, &recipient_onion_fields, outer_starting_htlc_offset, &None, None, Some(trampoline_packet)).unwrap();
2309-
let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv).unwrap();
2309+
let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv);
23102310
let outer_packet = onion_utils::construct_onion_packet(
23112311
outer_payloads,
23122312
outer_onion_keys,

lightning/src/ln/onion_utils.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2213,8 +2213,7 @@ mod tests {
22132213
let route = Route { paths: vec![path], route_params: None };
22142214

22152215
let onion_keys =
2216-
super::construct_onion_keys(&secp_ctx, &route.paths[0], &get_test_session_key())
2217-
.unwrap();
2216+
super::construct_onion_keys(&secp_ctx, &route.paths[0], &get_test_session_key());
22182217
assert_eq!(onion_keys.len(), route.paths[0].hops.len());
22192218
onion_keys
22202219
}
@@ -2579,13 +2578,12 @@ mod tests {
25792578
&secp_ctx,
25802579
&path.blinded_tail.as_ref().unwrap(),
25812580
&session_priv,
2582-
)
2583-
.unwrap();
2581+
);
25842582

25852583
let outer_onion_keys = {
25862584
let session_priv_hash = Sha256::hash(&session_priv.secret_bytes()).to_byte_array();
25872585
let outer_session_priv = SecretKey::from_slice(&session_priv_hash[..]).unwrap();
2588-
construct_onion_keys(&Secp256k1::new(), &path, &outer_session_priv).unwrap()
2586+
construct_onion_keys(&Secp256k1::new(), &path, &outer_session_priv)
25892587
};
25902588

25912589
let htlc_source = HTLCSource::OutboundRoute {

0 commit comments

Comments
 (0)