From: Elias Rohrer Date: Thu, 6 Jun 2024 11:08:51 +0000 (+0200) Subject: `rustfmt`: `fuzz/src/invoice*.rs` X-Git-Tag: v0.0.124-beta~91^2~11 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f1ac0a3d97cb216b994690c498cce37090995910;p=rust-lightning `rustfmt`: `fuzz/src/invoice*.rs` --- diff --git a/fuzz/src/invoice_request_deser.rs b/fuzz/src/invoice_request_deser.rs index 1381f6697..642da5823 100644 --- a/fuzz/src/invoice_request_deser.rs +++ b/fuzz/src/invoice_request_deser.rs @@ -7,17 +7,17 @@ // You may not use this file except in accordance with one or both of these // licenses. -use bitcoin::secp256k1::{Keypair, Parity, PublicKey, Secp256k1, SecretKey, self}; use crate::utils::test_logger; +use bitcoin::secp256k1::{self, Keypair, Parity, PublicKey, Secp256k1, SecretKey}; use core::convert::TryFrom; -use lightning::blinded_path::BlindedPath; use lightning::blinded_path::message::ForwardNode; -use lightning::sign::EntropySource; -use lightning::ln::PaymentHash; +use lightning::blinded_path::BlindedPath; use lightning::ln::features::BlindedHopFeatures; +use lightning::ln::PaymentHash; use lightning::offers::invoice::{BlindedPayInfo, UnsignedBolt12Invoice}; use lightning::offers::invoice_request::InvoiceRequest; use lightning::offers::parse::Bolt12SemanticError; +use lightning::sign::EntropySource; use lightning::util::ser::Writeable; #[inline] @@ -38,17 +38,17 @@ pub fn do_test(data: &[u8], _out: Out) { let even_pubkey = x_only_pubkey.public_key(Parity::Even); if signing_pubkey == odd_pubkey || signing_pubkey == even_pubkey { unsigned_invoice - .sign(|message: &UnsignedBolt12Invoice| + .sign(|message: &UnsignedBolt12Invoice| { Ok(secp_ctx.sign_schnorr_no_aux_rand(message.as_ref().as_digest(), &keys)) - ) + }) .unwrap() .write(&mut buffer) .unwrap(); } else { unsigned_invoice - .sign(|message: &UnsignedBolt12Invoice| + .sign(|message: &UnsignedBolt12Invoice| { Ok(secp_ctx.sign_schnorr_no_aux_rand(message.as_ref().as_digest(), &keys)) - ) + }) .unwrap_err(); } } @@ -58,7 +58,9 @@ pub fn do_test(data: &[u8], _out: Out) { struct Randomness; impl EntropySource for Randomness { - fn get_secure_random_bytes(&self) -> [u8; 32] { [42; 32] } + fn get_secure_random_bytes(&self) -> [u8; 32] { + [42; 32] + } } fn pubkey(byte: u8) -> PublicKey { @@ -71,7 +73,7 @@ fn privkey(byte: u8) -> SecretKey { } fn build_response( - invoice_request: &InvoiceRequest, secp_ctx: &Secp256k1 + invoice_request: &InvoiceRequest, secp_ctx: &Secp256k1, ) -> Result { let entropy_source = Randomness {}; let intermediate_nodes = [ @@ -85,8 +87,10 @@ fn build_response( ], ]; let paths = vec![ - BlindedPath::new_for_message(&intermediate_nodes[0], pubkey(42), &entropy_source, secp_ctx).unwrap(), - BlindedPath::new_for_message(&intermediate_nodes[1], pubkey(42), &entropy_source, secp_ctx).unwrap(), + BlindedPath::new_for_message(&intermediate_nodes[0], pubkey(42), &entropy_source, secp_ctx) + .unwrap(), + BlindedPath::new_for_message(&intermediate_nodes[1], pubkey(42), &entropy_source, secp_ctx) + .unwrap(), ]; let payinfo = vec![ diff --git a/rustfmt_excluded_files b/rustfmt_excluded_files index 6c4c2dd90..1b0fbc71f 100644 --- a/rustfmt_excluded_files +++ b/rustfmt_excluded_files @@ -1,8 +1,6 @@ ./bench/benches/bench.rs ./fuzz/src/chanmon_consistency.rs ./fuzz/src/full_stack.rs -./fuzz/src/invoice_deser.rs -./fuzz/src/invoice_request_deser.rs ./fuzz/src/lib.rs ./fuzz/src/msg_targets/mod.rs ./fuzz/src/msg_targets/msg_accept_channel.rs