From 8e1a98183d9346362b10f84d129af92f4f770a10 Mon Sep 17 00:00:00 2001 From: Elias Rohrer Date: Thu, 6 Jun 2024 13:11:19 +0200 Subject: [PATCH] `rustfmt`: `fuzz/src/peer_crypt.rs` --- fuzz/src/peer_crypt.rs | 36 ++++++++++++++++++++---------------- rustfmt_excluded_files | 1 - 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/fuzz/src/peer_crypt.rs b/fuzz/src/peer_crypt.rs index 41d8c0936..b01aa0240 100644 --- a/fuzz/src/peer_crypt.rs +++ b/fuzz/src/peer_crypt.rs @@ -7,33 +7,30 @@ // You may not use this file except in accordance with one or both of these // licenses. -use lightning::ln::peer_channel_encryptor::{PeerChannelEncryptor, MessageBuf}; +use lightning::ln::peer_channel_encryptor::{MessageBuf, PeerChannelEncryptor}; use lightning::util::test_utils::TestNodeSigner; -use bitcoin::secp256k1::{Secp256k1, PublicKey, SecretKey}; +use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey}; use crate::utils::test_logger; #[inline] fn slice_to_be16(v: &[u8]) -> u16 { - ((v[0] as u16) << 8*1) | - ((v[1] as u16) << 8*0) + ((v[0] as u16) << 8 * 1) | ((v[1] as u16) << 8 * 0) } #[inline] pub fn do_test(data: &[u8]) { let mut read_pos = 0; macro_rules! get_slice { - ($len: expr) => { - { - let slice_len = $len as usize; - if data.len() < read_pos + slice_len { - return; - } - read_pos += slice_len; - &data[read_pos - slice_len..read_pos] + ($len: expr) => {{ + let slice_len = $len as usize; + if data.len() < read_pos + slice_len { + return; } - } + read_pos += slice_len; + &data[read_pos - slice_len..read_pos] + }}; } let secp_ctx = Secp256k1::signing_only(); @@ -63,7 +60,12 @@ pub fn do_test(data: &[u8]) { crypter } else { let mut crypter = PeerChannelEncryptor::new_inbound(&&node_signer); - match crypter.process_act_one_with_keys(get_slice!(50), &&node_signer, ephemeral_key, &secp_ctx) { + match crypter.process_act_one_with_keys( + get_slice!(50), + &&node_signer, + ephemeral_key, + &secp_ctx, + ) { Ok(_) => {}, Err(_) => return, } @@ -77,9 +79,11 @@ pub fn do_test(data: &[u8]) { let mut buf = [0; 65536 + 16]; loop { if get_slice!(1)[0] == 0 { - crypter.encrypt_buffer(MessageBuf::from_encoded(&get_slice!(slice_to_be16(get_slice!(2))))); + crypter.encrypt_buffer(MessageBuf::from_encoded(&get_slice!(slice_to_be16( + get_slice!(2) + )))); } else { - let len = match crypter.decrypt_length_header(get_slice!(16+2)) { + let len = match crypter.decrypt_length_header(get_slice!(16 + 2)) { Ok(len) => len, Err(_) => return, }; diff --git a/rustfmt_excluded_files b/rustfmt_excluded_files index 1c125a11a..c627a3c6d 100644 --- a/rustfmt_excluded_files +++ b/rustfmt_excluded_files @@ -1,7 +1,6 @@ ./bench/benches/bench.rs ./fuzz/src/chanmon_consistency.rs ./fuzz/src/full_stack.rs -./fuzz/src/peer_crypt.rs ./fuzz/src/process_network_graph.rs ./fuzz/src/refund_deser.rs ./fuzz/src/router.rs -- 2.39.5