From 652dc05eda3ce73b578842060be0d2ccc0ce2d38 Mon Sep 17 00:00:00 2001 From: Jean Marchand Date: Mon, 24 Feb 2025 16:17:32 +0700 Subject: [PATCH] Add rustfmt config --- .github/workflows/CI.yml | 8 ++- .../benches/banks_client_comparison.rs | 17 ++--- crates/litesvm/benches/max_perf.rs | 17 ++--- crates/litesvm/benches/simple_bench.rs | 16 ++--- crates/litesvm/src/accounts_db.rs | 28 ++++---- crates/litesvm/src/error.rs | 3 +- crates/litesvm/src/format_logs.rs | 4 +- crates/litesvm/src/history.rs | 4 +- crates/litesvm/src/lib.rs | 69 ++++++++++--------- crates/litesvm/src/precompiles.rs | 3 +- crates/litesvm/src/spl/mod.rs | 4 +- crates/litesvm/src/types.rs | 3 +- .../litesvm/src/utils/inner_instructions.rs | 6 +- crates/litesvm/src/utils/serde_with_str.rs | 3 +- crates/litesvm/tests/blockhash.rs | 9 ++- crates/litesvm/tests/compute_budget.rs | 14 ++-- crates/litesvm/tests/counter_test.rs | 30 ++++---- crates/litesvm/tests/fees.rs | 12 ++-- crates/litesvm/tests/parsing.rs | 13 ++-- crates/litesvm/tests/precompiles.rs | 2 +- crates/litesvm/tests/spl.rs | 5 +- crates/litesvm/tests/system.rs | 6 +- crates/loader/src/lib.rs | 2 +- crates/loader/tests/loader.rs | 7 +- .../node-litesvm/src/transaction_metadata.rs | 6 +- rustfmt.toml | 3 + 26 files changed, 147 insertions(+), 147 deletions(-) create mode 100644 rustfmt.toml diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 47101ae6..c67ebd88 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -60,8 +60,14 @@ jobs: target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - name: Rustup install nightly + run: rustup toolchain install nightly + + - name: Rustup install rustfmt + run: rustup component add rustfmt --toolchain nightly + - name: Run cargo fmt - run: cargo fmt --all -- --check + run: cargo +nightly fmt --all -- --check - name: Run cargo clippy run: cargo clippy --all-targets -- -D warnings \ No newline at end of file diff --git a/crates/litesvm/benches/banks_client_comparison.rs b/crates/litesvm/benches/banks_client_comparison.rs index 518ab9ad..7a470827 100644 --- a/crates/litesvm/benches/banks_client_comparison.rs +++ b/crates/litesvm/benches/banks_client_comparison.rs @@ -1,15 +1,16 @@ -use std::{path::PathBuf, sync::Arc}; - -use criterion::{criterion_group, criterion_main, Criterion}; -use litesvm::LiteSVM; -use { - solana_account::Account, solana_feature_set::FeatureSet, solana_keypair::Keypair, - solana_message::Message, solana_signer::Signer, solana_transaction::Transaction, -}; use { + criterion::{criterion_group, criterion_main, Criterion}, + litesvm::LiteSVM, + solana_account::Account, + solana_feature_set::FeatureSet, solana_instruction::{account_meta::AccountMeta, Instruction}, + solana_keypair::Keypair, + solana_message::Message, solana_pubkey::Pubkey, solana_rent::Rent, + solana_signer::Signer, + solana_transaction::Transaction, + std::{path::PathBuf, sync::Arc}, }; fn read_counter_program() -> Vec { diff --git a/crates/litesvm/benches/max_perf.rs b/crates/litesvm/benches/max_perf.rs index ba90f4b5..52164b82 100644 --- a/crates/litesvm/benches/max_perf.rs +++ b/crates/litesvm/benches/max_perf.rs @@ -1,14 +1,15 @@ -use std::path::PathBuf; - -use criterion::{criterion_group, criterion_main, Criterion}; -use litesvm::LiteSVM; -use { - solana_account::Account, solana_keypair::Keypair, solana_message::Message, solana_rent::Rent, - solana_signer::Signer, solana_transaction::Transaction, -}; use { + criterion::{criterion_group, criterion_main, Criterion}, + litesvm::LiteSVM, + solana_account::Account, solana_instruction::{account_meta::AccountMeta, Instruction}, + solana_keypair::Keypair, + solana_message::Message, solana_pubkey::Pubkey, + solana_rent::Rent, + solana_signer::Signer, + solana_transaction::Transaction, + std::path::PathBuf, }; const NUM_GREETINGS: u8 = 255; diff --git a/crates/litesvm/benches/simple_bench.rs b/crates/litesvm/benches/simple_bench.rs index 56ad973f..ebacb95c 100644 --- a/crates/litesvm/benches/simple_bench.rs +++ b/crates/litesvm/benches/simple_bench.rs @@ -1,14 +1,14 @@ -use std::path::PathBuf; - -use criterion::{criterion_group, criterion_main, Criterion}; -use litesvm::LiteSVM; -use { - solana_account::Account, solana_keypair::Keypair, solana_message::Message, - solana_signer::Signer, solana_transaction::Transaction, -}; use { + criterion::{criterion_group, criterion_main, Criterion}, + litesvm::LiteSVM, + solana_account::Account, solana_instruction::{account_meta::AccountMeta, Instruction}, + solana_keypair::Keypair, + solana_message::Message, solana_pubkey::Pubkey, + solana_signer::Signer, + solana_transaction::Transaction, + std::path::PathBuf, }; fn read_counter_program() -> Vec { diff --git a/crates/litesvm/src/accounts_db.rs b/crates/litesvm/src/accounts_db.rs index cd9297e1..a1f28027 100644 --- a/crates/litesvm/src/accounts_db.rs +++ b/crates/litesvm/src/accounts_db.rs @@ -1,18 +1,7 @@ -use log::error; -use solana_program_runtime::{ - loaded_programs::{LoadProgramMetrics, ProgramCacheEntry, ProgramCacheForTxBatch}, - sysvar_cache::SysvarCache, -}; -use solana_system_program::{get_system_account_kind, SystemAccountKind}; -use std::{collections::HashMap, sync::Arc}; use { + crate::error::{InvalidSysvarDataError, LiteSVMError}, + log::error, solana_account::{state_traits::StateMut, AccountSharedData, ReadableAccount, WritableAccount}, - solana_nonce as nonce, - solana_pubkey::Pubkey, - solana_sdk_ids::native_loader, - solana_transaction_error::TransactionError, -}; -use { solana_address_lookup_table_interface::{error::AddressLookupError, state::AddressLookupTable}, solana_clock::Clock, solana_instruction::error::InstructionError, @@ -22,8 +11,14 @@ use { v0::{LoadedAddresses, MessageAddressTableLookup}, AddressLoader, AddressLoaderError, }, + solana_nonce as nonce, + solana_program_runtime::{ + loaded_programs::{LoadProgramMetrics, ProgramCacheEntry, ProgramCacheForTxBatch}, + sysvar_cache::SysvarCache, + }, + solana_pubkey::Pubkey, solana_sdk_ids::{ - bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4, + bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4, native_loader, sysvar::{ clock::ID as CLOCK_ID, epoch_rewards::ID as EPOCH_REWARDS_ID, epoch_schedule::ID as EPOCH_SCHEDULE_ID, last_restart_slot::ID as LAST_RESTART_SLOT_ID, @@ -31,11 +26,12 @@ use { stake_history::ID as STAKE_HISTORY_ID, }, }, + solana_system_program::{get_system_account_kind, SystemAccountKind}, solana_sysvar::Sysvar, + solana_transaction_error::TransactionError, + std::{collections::HashMap, sync::Arc}, }; -use crate::error::{InvalidSysvarDataError, LiteSVMError}; - const FEES_ID: Pubkey = solana_pubkey::pubkey!("SysvarFees111111111111111111111111111111111"); const RECENT_BLOCKHASHES_ID: Pubkey = solana_pubkey::pubkey!("SysvarRecentB1ockHashes11111111111111111111"); diff --git a/crates/litesvm/src/error.rs b/crates/litesvm/src/error.rs index 18360a49..4e9f2a4c 100644 --- a/crates/litesvm/src/error.rs +++ b/crates/litesvm/src/error.rs @@ -1,5 +1,4 @@ -use solana_instruction::error::InstructionError; -use thiserror::Error; +use {solana_instruction::error::InstructionError, thiserror::Error}; #[derive(Error, Debug)] pub enum InvalidSysvarDataError { diff --git a/crates/litesvm/src/format_logs.rs b/crates/litesvm/src/format_logs.rs index eb9e5e7e..5fe62762 100644 --- a/crates/litesvm/src/format_logs.rs +++ b/crates/litesvm/src/format_logs.rs @@ -1,6 +1,4 @@ -use std::fmt::Write; - -use ansi_term::Colour; +use {ansi_term::Colour, std::fmt::Write}; const PROGRAM_LOG: &str = "Program log:"; diff --git a/crates/litesvm/src/history.rs b/crates/litesvm/src/history.rs index 021cf549..1157fe2f 100644 --- a/crates/litesvm/src/history.rs +++ b/crates/litesvm/src/history.rs @@ -1,6 +1,4 @@ -use crate::types::TransactionResult; -use indexmap::IndexMap; -use solana_signature::Signature; +use {crate::types::TransactionResult, indexmap::IndexMap, solana_signature::Signature}; #[derive(Clone)] pub struct TransactionHistory(IndexMap); diff --git a/crates/litesvm/src/lib.rs b/crates/litesvm/src/lib.rs index 0706c547..19901da7 100644 --- a/crates/litesvm/src/lib.rs +++ b/crates/litesvm/src/lib.rs @@ -253,38 +253,37 @@ much easier. */ -use itertools::Itertools; -use log::error; -use precompiles::load_precompiles; #[cfg(feature = "nodejs-internal")] use qualifier_attr::qualifiers; -use solana_bpf_loader_program::syscalls::create_program_runtime_environment_v1; -use solana_bpf_loader_program::syscalls::create_program_runtime_environment_v2; -use solana_builtins::BUILTINS; -use solana_compute_budget::compute_budget::ComputeBudget; -use solana_compute_budget::compute_budget_limits::ComputeBudgetLimits; -use solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions; -use solana_log_collector::LogCollector; -use solana_program_runtime::{ - invoke_context::{BuiltinFunctionWithContext, EnvironmentConfig, InvokeContext}, - loaded_programs::{LoadProgramMetrics, ProgramCacheEntry}, -}; -use solana_svm_transaction::svm_message::SVMMessage; -use solana_system_program::{get_system_account_kind, SystemAccountKind}; #[allow(deprecated)] use solana_sysvar::recent_blockhashes::IterItem; #[allow(deprecated)] use solana_sysvar::{fees::Fees, recent_blockhashes::RecentBlockhashes}; -use solana_timings::ExecuteTimings; -use std::{cell::RefCell, path::Path, rc::Rc, sync::Arc}; -use types::SimulatedTransactionInfo; -use utils::{ - construct_instructions_account, - inner_instructions::inner_instructions_list_from_instruction_trace, -}; use { + crate::{ + accounts_db::AccountsDb, + error::LiteSVMError, + history::TransactionHistory, + message_processor::process_message, + spl::load_spl_programs, + types::{ + ExecutionResult, FailedTransactionMetadata, TransactionMetadata, TransactionResult, + }, + utils::{create_blockhash, rent::RentState}, + }, + itertools::Itertools, + log::error, + precompiles::load_precompiles, solana_account::{Account, AccountSharedData, ReadableAccount, WritableAccount}, + solana_bpf_loader_program::syscalls::{ + create_program_runtime_environment_v1, create_program_runtime_environment_v2, + }, + solana_builtins::BUILTINS, solana_clock::Clock, + solana_compute_budget::{ + compute_budget::ComputeBudget, compute_budget_limits::ComputeBudgetLimits, + }, + solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions, solana_epoch_rewards::EpochRewards, solana_epoch_schedule::EpochSchedule, solana_feature_set::FeatureSet, @@ -292,11 +291,16 @@ use { solana_hash::Hash, solana_keypair::Keypair, solana_last_restart_slot::LastRestartSlot, + solana_log_collector::LogCollector, solana_message::{ inner_instruction::InnerInstructionsList, Message, SanitizedMessage, VersionedMessage, }, solana_native_token::LAMPORTS_PER_SOL, solana_nonce::{state::DurableNonce, NONCED_TX_MARKER_IX_INDEX}, + solana_program_runtime::{ + invoke_context::{BuiltinFunctionWithContext, EnvironmentConfig, InvokeContext}, + loaded_programs::{LoadProgramMetrics, ProgramCacheEntry}, + }, solana_pubkey::Pubkey, solana_rent::Rent, solana_reserved_account_keys::ReservedAccountKeys, @@ -306,24 +310,23 @@ use { solana_slot_hashes::SlotHashes, solana_slot_history::SlotHistory, solana_stake_interface::stake_history::StakeHistory, + solana_svm_transaction::svm_message::SVMMessage, + solana_system_program::{get_system_account_kind, SystemAccountKind}, solana_sysvar::Sysvar, solana_sysvar_id::SysvarId, + solana_timings::ExecuteTimings, solana_transaction::{ sanitized::{MessageHash, SanitizedTransaction}, versioned::VersionedTransaction, }, solana_transaction_context::{ExecutionRecord, IndexOfAccount, TransactionContext}, solana_transaction_error::TransactionError, -}; - -use crate::{ - accounts_db::AccountsDb, - error::LiteSVMError, - history::TransactionHistory, - message_processor::process_message, - spl::load_spl_programs, - types::{ExecutionResult, FailedTransactionMetadata, TransactionMetadata, TransactionResult}, - utils::{create_blockhash, rent::RentState}, + std::{cell::RefCell, path::Path, rc::Rc, sync::Arc}, + types::SimulatedTransactionInfo, + utils::{ + construct_instructions_account, + inner_instructions::inner_instructions_list_from_instruction_trace, + }, }; pub mod error; diff --git a/crates/litesvm/src/precompiles.rs b/crates/litesvm/src/precompiles.rs index 309818c5..435f8c64 100644 --- a/crates/litesvm/src/precompiles.rs +++ b/crates/litesvm/src/precompiles.rs @@ -1,11 +1,10 @@ use { + crate::LiteSVM, solana_account::{AccountSharedData, WritableAccount}, solana_precompiles::get_precompiles, solana_sdk_ids::native_loader, }; -use crate::LiteSVM; - pub(crate) fn load_precompiles(svm: &mut LiteSVM) { let mut account = AccountSharedData::default(); account.set_owner(native_loader::id()); diff --git a/crates/litesvm/src/spl/mod.rs b/crates/litesvm/src/spl/mod.rs index 638d9699..a7175ab4 100644 --- a/crates/litesvm/src/spl/mod.rs +++ b/crates/litesvm/src/spl/mod.rs @@ -1,6 +1,4 @@ -use solana_pubkey::pubkey; - -use crate::LiteSVM; +use {crate::LiteSVM, solana_pubkey::pubkey}; pub fn load_spl_programs(svm: &mut LiteSVM) { svm.add_program( diff --git a/crates/litesvm/src/types.rs b/crates/litesvm/src/types.rs index 31b51e87..385554e8 100644 --- a/crates/litesvm/src/types.rs +++ b/crates/litesvm/src/types.rs @@ -1,4 +1,5 @@ use { + crate::format_logs::format_logs, solana_account::AccountSharedData, solana_instruction::error::InstructionError, solana_message::inner_instruction::InnerInstructionsList, @@ -9,8 +10,6 @@ use { solana_transaction_error::{TransactionError, TransactionResult as Result}, }; -use crate::format_logs::format_logs; - #[derive(Debug, Default, Clone, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct TransactionMetadata { diff --git a/crates/litesvm/src/utils/inner_instructions.rs b/crates/litesvm/src/utils/inner_instructions.rs index 20bac959..f5197ad8 100644 --- a/crates/litesvm/src/utils/inner_instructions.rs +++ b/crates/litesvm/src/utils/inner_instructions.rs @@ -1,7 +1,9 @@ use { solana_instruction::TRANSACTION_LEVEL_STACK_HEIGHT, - solana_message::compiled_instruction::CompiledInstruction, - solana_message::inner_instruction::{InnerInstruction, InnerInstructionsList}, + solana_message::{ + compiled_instruction::CompiledInstruction, + inner_instruction::{InnerInstruction, InnerInstructionsList}, + }, solana_transaction_context::TransactionContext, }; diff --git a/crates/litesvm/src/utils/serde_with_str.rs b/crates/litesvm/src/utils/serde_with_str.rs index ff4b67d7..195b217f 100644 --- a/crates/litesvm/src/utils/serde_with_str.rs +++ b/crates/litesvm/src/utils/serde_with_str.rs @@ -1,6 +1,5 @@ use { - serde::{de, Deserializer, Serializer}, - serde::{Deserialize, Serialize}, + serde::{de, Deserialize, Deserializer, Serialize, Serializer}, std::str::FromStr, }; diff --git a/crates/litesvm/tests/blockhash.rs b/crates/litesvm/tests/blockhash.rs index f9513bd5..179f2ee3 100644 --- a/crates/litesvm/tests/blockhash.rs +++ b/crates/litesvm/tests/blockhash.rs @@ -1,20 +1,19 @@ -use litesvm::LiteSVM; use { + litesvm::LiteSVM, solana_account::{state_traits::StateMut, ReadableAccount}, solana_keypair::Keypair, + solana_message::Message, solana_nonce::{ state::{Data, State as NonceState}, versions::Versions, }, + solana_pubkey::Pubkey, solana_rent::Rent, solana_signer::Signer, - solana_system_interface::instruction::advance_nonce_account, + solana_system_interface::instruction::{advance_nonce_account, transfer}, solana_transaction::Transaction, solana_transaction_error::TransactionError, }; -use { - solana_message::Message, solana_pubkey::Pubkey, solana_system_interface::instruction::transfer, -}; fn data_from_state(state: &NonceState) -> &Data { match state { diff --git a/crates/litesvm/tests/compute_budget.rs b/crates/litesvm/tests/compute_budget.rs index 23f132d2..7779995f 100644 --- a/crates/litesvm/tests/compute_budget.rs +++ b/crates/litesvm/tests/compute_budget.rs @@ -1,13 +1,9 @@ -use litesvm::LiteSVM; -use solana_compute_budget::compute_budget::ComputeBudget; use { - solana_compute_budget_interface::ComputeBudgetInstruction, solana_keypair::Keypair, - solana_signer::Signer, solana_transaction::Transaction, - solana_transaction_error::TransactionError, -}; -use { - solana_instruction::error::InstructionError, solana_message::Message, solana_pubkey::Pubkey, - solana_system_interface::instruction::transfer, + litesvm::LiteSVM, solana_compute_budget::compute_budget::ComputeBudget, + solana_compute_budget_interface::ComputeBudgetInstruction, + solana_instruction::error::InstructionError, solana_keypair::Keypair, solana_message::Message, + solana_pubkey::Pubkey, solana_signer::Signer, solana_system_interface::instruction::transfer, + solana_transaction::Transaction, solana_transaction_error::TransactionError, }; #[test_log::test] diff --git a/crates/litesvm/tests/counter_test.rs b/crates/litesvm/tests/counter_test.rs index 3284a89b..9b9ad047 100644 --- a/crates/litesvm/tests/counter_test.rs +++ b/crates/litesvm/tests/counter_test.rs @@ -1,21 +1,21 @@ -use std::path::PathBuf; - -use litesvm::LiteSVM; -use solana_address_lookup_table_interface::instruction::{ - create_lookup_table, extend_lookup_table, -}; -use solana_message::VersionedMessage; -use solana_transaction::versioned::VersionedTransaction; -use solana_transaction_error::TransactionError; -use { - solana_account::Account, solana_keypair::Keypair, solana_pubkey::pubkey, - solana_signature::Signature, solana_signer::Signer, solana_transaction::Transaction, -}; use { + litesvm::LiteSVM, + solana_account::Account, + solana_address_lookup_table_interface::instruction::{ + create_lookup_table, extend_lookup_table, + }, solana_instruction::{account_meta::AccountMeta, Instruction}, - solana_message::{v0::Message as MessageV0, AddressLookupTableAccount, Message}, - solana_pubkey::Pubkey, + solana_keypair::Keypair, + solana_message::{ + v0::Message as MessageV0, AddressLookupTableAccount, Message, VersionedMessage, + }, + solana_pubkey::{pubkey, Pubkey}, solana_rent::Rent, + solana_signature::Signature, + solana_signer::Signer, + solana_transaction::{versioned::VersionedTransaction, Transaction}, + solana_transaction_error::TransactionError, + std::path::PathBuf, }; const NUM_GREETINGS: u8 = 127; diff --git a/crates/litesvm/tests/fees.rs b/crates/litesvm/tests/fees.rs index c416e6e1..dee655ed 100644 --- a/crates/litesvm/tests/fees.rs +++ b/crates/litesvm/tests/fees.rs @@ -1,17 +1,15 @@ -use std::path::PathBuf; - -use litesvm::LiteSVM; use { + litesvm::LiteSVM, solana_instruction::{error::InstructionError, Instruction}, solana_keypair::Keypair, - solana_pubkey::pubkey, + solana_message::Message, + solana_pubkey::{pubkey, Pubkey}, solana_rent::Rent, solana_signer::Signer, + solana_system_interface::instruction::transfer, solana_transaction::Transaction, solana_transaction_error::TransactionError, -}; -use { - solana_message::Message, solana_pubkey::Pubkey, solana_system_interface::instruction::transfer, + std::path::PathBuf, }; #[test_log::test] diff --git a/crates/litesvm/tests/parsing.rs b/crates/litesvm/tests/parsing.rs index af42e846..653648bb 100644 --- a/crates/litesvm/tests/parsing.rs +++ b/crates/litesvm/tests/parsing.rs @@ -1,9 +1,12 @@ -use litesvm::LiteSVM; -use solana_address_lookup_table_interface::instruction::{ - create_lookup_table, extend_lookup_table, -}; use { - solana_keypair::Keypair, solana_message::Message, solana_pubkey::Pubkey, solana_signer::Signer, + litesvm::LiteSVM, + solana_address_lookup_table_interface::instruction::{ + create_lookup_table, extend_lookup_table, + }, + solana_keypair::Keypair, + solana_message::Message, + solana_pubkey::Pubkey, + solana_signer::Signer, solana_transaction::Transaction, }; diff --git a/crates/litesvm/tests/precompiles.rs b/crates/litesvm/tests/precompiles.rs index 667a93cb..3c6a15b6 100644 --- a/crates/litesvm/tests/precompiles.rs +++ b/crates/litesvm/tests/precompiles.rs @@ -1,5 +1,5 @@ -use litesvm::LiteSVM; use { + litesvm::LiteSVM, solana_ed25519_program::{self as ed25519_instruction, new_ed25519_instruction}, solana_instruction::error::InstructionError, solana_keypair::Keypair, diff --git a/crates/litesvm/tests/spl.rs b/crates/litesvm/tests/spl.rs index 8a76a3b3..a09856e4 100644 --- a/crates/litesvm/tests/spl.rs +++ b/crates/litesvm/tests/spl.rs @@ -1,7 +1,6 @@ -use litesvm::LiteSVM; use { - solana_keypair::Keypair, solana_program_pack::Pack, solana_rent::Rent, solana_signer::Signer, - solana_transaction::Transaction, + litesvm::LiteSVM, solana_keypair::Keypair, solana_program_pack::Pack, solana_rent::Rent, + solana_signer::Signer, solana_transaction::Transaction, }; #[test] diff --git a/crates/litesvm/tests/system.rs b/crates/litesvm/tests/system.rs index b8e7a4d9..dbee0eed 100644 --- a/crates/litesvm/tests/system.rs +++ b/crates/litesvm/tests/system.rs @@ -1,9 +1,11 @@ -use litesvm::LiteSVM; -use {solana_keypair::Keypair, solana_signer::Signer, solana_transaction::Transaction}; use { + litesvm::LiteSVM, + solana_keypair::Keypair, solana_message::Message, solana_pubkey::Pubkey, + solana_signer::Signer, solana_system_interface::instruction::{create_account, transfer}, + solana_transaction::Transaction, }; #[test_log::test] diff --git a/crates/loader/src/lib.rs b/crates/loader/src/lib.rs index 46d7ffe3..477ae47f 100644 --- a/crates/loader/src/lib.rs +++ b/crates/loader/src/lib.rs @@ -1,5 +1,5 @@ -use litesvm::{types::FailedTransactionMetadata, LiteSVM}; use { + litesvm::{types::FailedTransactionMetadata, LiteSVM}, solana_keypair::Keypair, solana_loader_v3_interface::{ instruction as bpf_loader_upgradeable, state::UpgradeableLoaderState, diff --git a/crates/loader/tests/loader.rs b/crates/loader/tests/loader.rs index cd46d747..fe24afd2 100644 --- a/crates/loader/tests/loader.rs +++ b/crates/loader/tests/loader.rs @@ -1,6 +1,7 @@ -use litesvm::LiteSVM; -use litesvm_loader::{deploy_upgradeable_program, set_upgrade_authority}; use { + crate::programs_bytes::HELLO_WORLD_BYTES, + litesvm::LiteSVM, + litesvm_loader::{deploy_upgradeable_program, set_upgrade_authority}, solana_feature_set::FeatureSet, solana_instruction::{account_meta::AccountMeta, Instruction}, solana_keypair::Keypair, @@ -9,8 +10,6 @@ use { solana_transaction::Transaction, }; -use crate::programs_bytes::HELLO_WORLD_BYTES; - mod programs_bytes; #[test] diff --git a/crates/node-litesvm/src/transaction_metadata.rs b/crates/node-litesvm/src/transaction_metadata.rs index 56f5c2b1..e2d9730e 100644 --- a/crates/node-litesvm/src/transaction_metadata.rs +++ b/crates/node-litesvm/src/transaction_metadata.rs @@ -11,8 +11,10 @@ use { }, napi::bindgen_prelude::*, solana_account::Account as AccountOriginal, - solana_message::compiled_instruction::CompiledInstruction as CompiledInstructionOriginal, - solana_message::inner_instruction::InnerInstruction as InnerInstructionOriginal, + solana_message::{ + compiled_instruction::CompiledInstruction as CompiledInstructionOriginal, + inner_instruction::InnerInstruction as InnerInstructionOriginal, + }, solana_transaction_context::TransactionReturnData as TransactionReturnDataOriginal, }; diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 00000000..126950cc --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,3 @@ +imports_granularity = "One" +group_imports = "One" +use_field_init_shorthand = true