X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonion_utils.rs;h=88f0efe9aa8f393060372dc2b05c843f3be5e1b0;hb=47d34c3668061eaa84adffcf91d0c3d7ad4162c7;hp=08fe7a73ae6f225df9ca9f873e8da1407689c3d1;hpb=7f765a39bcf1464fab92d19b6ecd6f38e296a30e;p=rust-lightning

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index 08fe7a73..88f0efe9 100644
--- a/lightning/src/ln/onion_utils.rs
+++ b/lightning/src/ln/onion_utils.rs
@@ -242,6 +242,8 @@ pub(super) fn build_onion_payloads(path: &Path, total_msat: u64, mut recipient_o
 /// the hops can be of variable length.
 pub(crate) const ONION_DATA_LEN: usize = 20*65;
 
+pub(super) const INVALID_ONION_BLINDING: u16 = 0x8000 | 0x4000 | 24;
+
 #[inline]
 fn shift_slice_right(arr: &mut [u8], amt: usize) {
 	for i in (amt..arr.len()).rev() {
@@ -502,8 +504,21 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
 				Some(hop) => hop,
 				None => {
 					// The failing hop is within a multi-hop blinded path.
-					error_code_ret = Some(BADONION | PERM | 24); // invalid_onion_blinding
-					error_packet_ret = Some(vec![0; 32]);
+					#[cfg(not(test))] {
+						error_code_ret = Some(BADONION | PERM | 24); // invalid_onion_blinding
+						error_packet_ret = Some(vec![0; 32]);
+					}
+					#[cfg(test)] {
+						// Actually parse the onion error data in tests so we can check that blinded hops fail
+						// back correctly.
+						let err_packet = decrypt_onion_error_packet(
+							&mut encrypted_packet, shared_secret
+						).unwrap();
+						error_code_ret =
+							Some(u16::from_be_bytes(err_packet.failuremsg.get(0..2).unwrap().try_into().unwrap()));
+						error_packet_ret = Some(err_packet.failuremsg[2..].to_vec());
+					}
+
 					res = Some(FailureLearnings {
 						network_update: None, short_channel_id: None, payment_failed_permanently: false
 					});