From 2884fdd00ae0908af6e0683982bc7cc7258d7288 Mon Sep 17 00:00:00 2001 From: Sergio Chouhy Date: Tue, 12 Aug 2025 16:48:53 -0300 Subject: [PATCH] fmt --- common/src/block.rs | 2 -- common/src/rpc_primitives/requests.rs | 2 +- common/src/sequencer_client/mod.rs | 4 +++- common/src/test_utils.rs | 6 ++++-- nssa/src/public_transaction/encoding.rs | 4 ++-- nssa/src/public_transaction/message.rs | 1 - nssa/src/public_transaction/mod.rs | 3 +-- nssa/src/public_transaction/witness_set.rs | 1 - nssa/src/signature/encoding.rs | 1 - nssa/src/signature/private_key.rs | 2 -- nssa/src/signature/public_key.rs | 1 - nssa/src/signature/signature.rs | 2 +- wallet/src/lib.rs | 3 ++- 13 files changed, 14 insertions(+), 18 deletions(-) diff --git a/common/src/block.rs b/common/src/block.rs index 974c230..3d39e58 100644 --- a/common/src/block.rs +++ b/common/src/block.rs @@ -103,8 +103,6 @@ fn u64_from_cursor(cursor: &mut Cursor<&[u8]>) -> u64 { u64::from_le_bytes(word_buf) } - - #[cfg(test)] mod tests { use crate::{block::HashableBlockData, test_utils}; diff --git a/common/src/rpc_primitives/requests.rs b/common/src/rpc_primitives/requests.rs index 1b2bbbe..085051b 100644 --- a/common/src/rpc_primitives/requests.rs +++ b/common/src/rpc_primitives/requests.rs @@ -17,7 +17,7 @@ pub struct RegisterAccountRequest { #[derive(Serialize, Deserialize, Debug)] pub struct SendTxRequest { - pub transaction: Vec + pub transaction: Vec, } #[derive(Serialize, Deserialize, Debug)] diff --git a/common/src/sequencer_client/mod.rs b/common/src/sequencer_client/mod.rs index 44f0e23..a131033 100644 --- a/common/src/sequencer_client/mod.rs +++ b/common/src/sequencer_client/mod.rs @@ -91,7 +91,9 @@ impl SequencerClient { &self, transaction: nssa::PublicTransaction, ) -> Result { - let tx_req = SendTxRequest { transaction: transaction.to_bytes() }; + let tx_req = SendTxRequest { + transaction: transaction.to_bytes(), + }; let req = serde_json::to_value(tx_req)?; diff --git a/common/src/test_utils.rs b/common/src/test_utils.rs index d982a39..b956cd7 100644 --- a/common/src/test_utils.rs +++ b/common/src/test_utils.rs @@ -32,7 +32,8 @@ pub fn produce_dummy_empty_transaction() -> nssa::PublicTransaction { let nonces = vec![]; let instruction_data: u128 = 0; let message = - nssa::public_transaction::Message::try_new(program_id, addresses, nonces, instruction_data).unwrap(); + nssa::public_transaction::Message::try_new(program_id, addresses, nonces, instruction_data) + .unwrap(); let private_key = nssa::PrivateKey::try_new([1; 32]).unwrap(); let witness_set = nssa::public_transaction::WitnessSet::for_message(&message, &[&private_key]); nssa::PublicTransaction::new(message, witness_set) @@ -49,7 +50,8 @@ pub fn create_transaction_native_token_transfer( let nonces = vec![nonce]; let program_id = nssa::program::Program::authenticated_transfer_program().id(); let message = - nssa::public_transaction::Message::try_new(program_id, addresses, nonces, balance_to_move).unwrap(); + nssa::public_transaction::Message::try_new(program_id, addresses, nonces, balance_to_move) + .unwrap(); let witness_set = nssa::public_transaction::WitnessSet::for_message(&message, &[&signing_key]); nssa::PublicTransaction::new(message, witness_set) } diff --git a/nssa/src/public_transaction/encoding.rs b/nssa/src/public_transaction/encoding.rs index eb7fbfc..e687bbe 100644 --- a/nssa/src/public_transaction/encoding.rs +++ b/nssa/src/public_transaction/encoding.rs @@ -3,7 +3,8 @@ use std::io::{Cursor, Read}; use nssa_core::program::ProgramId; use crate::{ - public_transaction::{Message, WitnessSet}, Address, PublicKey, PublicTransaction, Signature + Address, PublicKey, PublicTransaction, Signature, + public_transaction::{Message, WitnessSet}, }; const MESSAGE_ENCODING_PREFIX_LEN: usize = 19; @@ -87,7 +88,6 @@ impl Message { } } - impl WitnessSet { pub(crate) fn to_bytes(&self) -> Vec { let mut bytes = Vec::new(); diff --git a/nssa/src/public_transaction/message.rs b/nssa/src/public_transaction/message.rs index 4b4e72a..28322c2 100644 --- a/nssa/src/public_transaction/message.rs +++ b/nssa/src/public_transaction/message.rs @@ -32,4 +32,3 @@ impl Message { }) } } - diff --git a/nssa/src/public_transaction/mod.rs b/nssa/src/public_transaction/mod.rs index 6111bae..769be5a 100644 --- a/nssa/src/public_transaction/mod.rs +++ b/nssa/src/public_transaction/mod.rs @@ -48,7 +48,6 @@ impl PublicTransaction { } } - pub fn hash(&self) -> [u8; 32] { let bytes = self.to_bytes(); let mut hasher = sha2::Sha256::new(); @@ -126,7 +125,7 @@ mod tests { use std::io::Cursor; use crate::{ - Address, PrivateKey, PublicTransaction, PublicKey, + Address, PrivateKey, PublicKey, PublicTransaction, program::Program, public_transaction::{Message, WitnessSet}, }; diff --git a/nssa/src/public_transaction/witness_set.rs b/nssa/src/public_transaction/witness_set.rs index 83edf66..e9b0f59 100644 --- a/nssa/src/public_transaction/witness_set.rs +++ b/nssa/src/public_transaction/witness_set.rs @@ -34,5 +34,4 @@ impl WitnessSet { pub fn iter_signatures(&self) -> impl Iterator { self.signatures_and_public_keys.iter() } - } diff --git a/nssa/src/signature/encoding.rs b/nssa/src/signature/encoding.rs index a7f112e..7e6ce58 100644 --- a/nssa/src/signature/encoding.rs +++ b/nssa/src/signature/encoding.rs @@ -2,7 +2,6 @@ use std::io::{Cursor, Read}; use crate::{PublicKey, Signature}; - impl PublicKey { // TODO: remove unwraps and return Result pub(crate) fn from_cursor(cursor: &mut Cursor<&[u8]>) -> Self { diff --git a/nssa/src/signature/private_key.rs b/nssa/src/signature/private_key.rs index 78a2ad5..a58d363 100644 --- a/nssa/src/signature/private_key.rs +++ b/nssa/src/signature/private_key.rs @@ -2,7 +2,6 @@ use serde::{Deserialize, Serialize}; use crate::error::NssaError; - // TODO: Dummy impl. Replace by actual private key. // TODO: Remove Debug, Clone, Serialize, Deserialize, PartialEq and Eq for security reasons // TODO: Implement Zeroize @@ -22,4 +21,3 @@ impl PrivateKey { } } } - diff --git a/nssa/src/signature/public_key.rs b/nssa/src/signature/public_key.rs index 0ba4b44..bda1548 100644 --- a/nssa/src/signature/public_key.rs +++ b/nssa/src/signature/public_key.rs @@ -39,5 +39,4 @@ mod tests { ); } } - } diff --git a/nssa/src/signature/signature.rs b/nssa/src/signature/signature.rs index 0f956af..0bfcbd7 100644 --- a/nssa/src/signature/signature.rs +++ b/nssa/src/signature/signature.rs @@ -1,6 +1,6 @@ use std::io::{Cursor, Read}; -use rand::{rngs::OsRng, RngCore}; +use rand::{RngCore, rngs::OsRng}; use crate::{PrivateKey, PublicKey, error::NssaError, public_transaction::Message}; diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs index 19152ee..b464ede 100644 --- a/wallet/src/lib.rs +++ b/wallet/src/lib.rs @@ -84,7 +84,8 @@ impl WalletCore { addresses, nonces, balance_to_move, - ).unwrap(); + ) + .unwrap(); let signing_key = account.key_holder.get_pub_account_signing_key(); let witness_set =