fixup! Refactor onion_utils to encrypt/decrypt OnionErrorPacket types

Author: joostjager

lightning/src/ln/onion_route_tests.rs

@@ -686,7 +686,7 @@ fn test_onion_failure() {
 			let mut onion_error = OnionErrorPacket {
 				data: decoded_err_packet.encode(),
 			};
-			onion_utils::crypt_failure_packet(
+			onion_utils::test_crypt_failure_packet(
 				&onion_keys[1].shared_secret.as_ref(), &mut onion_error);
 			msg.reason = onion_error.data;
 		}, || nodes[2].node.fail_htlc_backwards(&payment_hash), false, None,
@@ -713,7 +713,7 @@ fn test_onion_failure() {
 			let mut onion_error = OnionErrorPacket{
 				data: decoded_err_packet.encode(),
 			};
-			onion_utils::crypt_failure_packet(
+			onion_utils::test_crypt_failure_packet(
 				&onion_keys[0].shared_secret.as_ref(), &mut onion_error);
 			msg.reason = onion_error.data;
 		}, || {}, true, Some(0x1000|7),
@@ -741,7 +741,7 @@ fn test_onion_failure() {
 			let mut onion_error = OnionErrorPacket{
 				data: decoded_err_packet.encode(),
 			};
-			onion_utils::crypt_failure_packet(
+			onion_utils::test_crypt_failure_packet(
 				&onion_keys[1].shared_secret.as_ref(), &mut onion_error);
 			msg.reason = onion_error.data;
 		}, || nodes[2].node.fail_htlc_backwards(&payment_hash), true, Some(0x1000|7),

lightning/src/ln/onion_utils.rs

@@ -871,11 +871,16 @@ fn construct_onion_packet_with_init_noise<HD: Writeable, P: Packet>(
 }
 
 /// Encrypts/decrypts a failure packet.
-pub(super) fn crypt_failure_packet(shared_secret: &[u8], packet: &mut OnionErrorPacket) {
+fn crypt_failure_packet(shared_secret: &[u8], packet: &mut OnionErrorPacket) {
 	let ammag = gen_ammag_from_shared_secret(&shared_secret);
 	process_chacha(&ammag, &mut packet.data);
 }
 
+#[cfg(test)]
+pub(super) fn test_crypt_failure_packet(shared_secret: &[u8], packet: &mut OnionErrorPacket) {
+	crypt_failure_packet(shared_secret, packet)
+}
+
 fn process_chacha(key: &[u8; 32], packet: &mut [u8]) {
 	let mut chacha = ChaCha20::new(key, &[0u8; 8]);
 	chacha.process_in_place(packet);