f move unwrap removals up

Author: TheBlueMatt

lightning/src/ln/blinded_payment_tests.rs

@@ -2100,7 +2100,7 @@ fn do_test_trampoline_single_hop_receive(success: bool) {
 			// pop the last dummy hop
 			trampoline_payloads.pop();
 
-			let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key).unwrap();
+			let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key);
 			let trampoline_packet = onion_utils::construct_trampoline_onion_packet(
 				trampoline_payloads,
 				trampoline_onion_keys,
@@ -2112,7 +2112,7 @@ fn do_test_trampoline_single_hop_receive(success: bool) {
 			let outer_session_priv = secret_from_hex("e52c20461ed7acd46c4e7b591a37610519179482887bd73bf3b94617f8f03677");
 
 			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();
-			let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv).unwrap();
+			let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv);
 			let outer_packet = onion_utils::construct_onion_packet(
 				outer_payloads,
 				outer_onion_keys,
@@ -2294,7 +2294,7 @@ fn test_trampoline_unblinded_receive() {
 			cltv_expiry_height: 104,
 		});
 
-		let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key).unwrap();
+		let trampoline_onion_keys = onion_utils::construct_trampoline_onion_keys(&secp_ctx, &route.paths[0].blinded_tail.as_ref().unwrap(), &trampoline_secret_key);
 		let trampoline_packet = onion_utils::construct_trampoline_onion_packet(
 			trampoline_payloads,
 			trampoline_onion_keys,
@@ -2306,7 +2306,7 @@ fn test_trampoline_unblinded_receive() {
 		let outer_session_priv = secret_from_hex("e52c20461ed7acd46c4e7b591a37610519179482887bd73bf3b94617f8f03677");
 
 		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();
-		let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv).unwrap();
+		let outer_onion_keys = onion_utils::construct_onion_keys(&secp_ctx, &route.clone().paths[0], &outer_session_priv);
 		let outer_packet = onion_utils::construct_onion_packet(
 			outer_payloads,
 			outer_onion_keys,

lightning/src/ln/onion_utils.rs

@@ -2213,8 +2213,7 @@ mod tests {
 		let route = Route { paths: vec![path], route_params: None };
 
 		let onion_keys =
-			super::construct_onion_keys(&secp_ctx, &route.paths[0], &get_test_session_key())
-				.unwrap();
+			super::construct_onion_keys(&secp_ctx, &route.paths[0], &get_test_session_key());
 		assert_eq!(onion_keys.len(), route.paths[0].hops.len());
 		onion_keys
 	}
@@ -2579,13 +2578,12 @@ mod tests {
 				&secp_ctx,
 				&path.blinded_tail.as_ref().unwrap(),
 				&session_priv,
-			)
-			.unwrap();
+			);
 
 			let outer_onion_keys = {
 				let session_priv_hash = Sha256::hash(&session_priv.secret_bytes()).to_byte_array();
 				let outer_session_priv = SecretKey::from_slice(&session_priv_hash[..]).unwrap();
-				construct_onion_keys(&Secp256k1::new(), &path, &outer_session_priv).unwrap()
+				construct_onion_keys(&Secp256k1::new(), &path, &outer_session_priv)
 			};
 
 			let htlc_source = HTLCSource::OutboundRoute {