Reformat imports to a consistent style for imports
rustfmt.toml configuration: imports_granularity = "One" group_imports = "One"
This commit is contained in:
		@@ -1,48 +1,53 @@
 | 
			
		||||
use crate::{
 | 
			
		||||
    accounts_db::{
 | 
			
		||||
        AccountShrinkThreshold, AccountsAddRootTiming, AccountsDb, AccountsDbConfig, BankHashInfo,
 | 
			
		||||
        ErrorCounters, LoadHint, LoadedAccount, ScanStorageResult,
 | 
			
		||||
        ACCOUNTS_DB_CONFIG_FOR_BENCHMARKS, ACCOUNTS_DB_CONFIG_FOR_TESTING,
 | 
			
		||||
use {
 | 
			
		||||
    crate::{
 | 
			
		||||
        accounts_db::{
 | 
			
		||||
            AccountShrinkThreshold, AccountsAddRootTiming, AccountsDb, AccountsDbConfig,
 | 
			
		||||
            BankHashInfo, ErrorCounters, LoadHint, LoadedAccount, ScanStorageResult,
 | 
			
		||||
            ACCOUNTS_DB_CONFIG_FOR_BENCHMARKS, ACCOUNTS_DB_CONFIG_FOR_TESTING,
 | 
			
		||||
        },
 | 
			
		||||
        accounts_index::{AccountSecondaryIndexes, IndexKey, ScanConfig, ScanError, ScanResult},
 | 
			
		||||
        accounts_update_notifier_interface::AccountsUpdateNotifier,
 | 
			
		||||
        ancestors::Ancestors,
 | 
			
		||||
        bank::{
 | 
			
		||||
            Bank, NonceFull, NonceInfo, RentDebits, TransactionCheckResult,
 | 
			
		||||
            TransactionExecutionResult,
 | 
			
		||||
        },
 | 
			
		||||
        blockhash_queue::BlockhashQueue,
 | 
			
		||||
        rent_collector::RentCollector,
 | 
			
		||||
        system_instruction_processor::{get_system_account_kind, SystemAccountKind},
 | 
			
		||||
    },
 | 
			
		||||
    accounts_index::{AccountSecondaryIndexes, IndexKey, ScanConfig, ScanError, ScanResult},
 | 
			
		||||
    accounts_update_notifier_interface::AccountsUpdateNotifier,
 | 
			
		||||
    ancestors::Ancestors,
 | 
			
		||||
    bank::{
 | 
			
		||||
        Bank, NonceFull, NonceInfo, RentDebits, TransactionCheckResult, TransactionExecutionResult,
 | 
			
		||||
    dashmap::{
 | 
			
		||||
        mapref::entry::Entry::{Occupied, Vacant},
 | 
			
		||||
        DashMap,
 | 
			
		||||
    },
 | 
			
		||||
    log::*,
 | 
			
		||||
    rand::{thread_rng, Rng},
 | 
			
		||||
    solana_sdk::{
 | 
			
		||||
        account::{Account, AccountSharedData, ReadableAccount, WritableAccount},
 | 
			
		||||
        account_utils::StateMut,
 | 
			
		||||
        bpf_loader_upgradeable::{self, UpgradeableLoaderState},
 | 
			
		||||
        clock::{BankId, Slot, INITIAL_RENT_EPOCH},
 | 
			
		||||
        feature_set::{self, FeatureSet},
 | 
			
		||||
        genesis_config::ClusterType,
 | 
			
		||||
        hash::Hash,
 | 
			
		||||
        message::SanitizedMessage,
 | 
			
		||||
        native_loader,
 | 
			
		||||
        nonce::{state::Versions as NonceVersions, State as NonceState},
 | 
			
		||||
        pubkey::Pubkey,
 | 
			
		||||
        system_program,
 | 
			
		||||
        sysvar::{self, instructions::construct_instructions_data},
 | 
			
		||||
        transaction::{Result, SanitizedTransaction, TransactionError},
 | 
			
		||||
    },
 | 
			
		||||
    std::{
 | 
			
		||||
        cmp::Reverse,
 | 
			
		||||
        collections::{hash_map, BinaryHeap, HashMap, HashSet},
 | 
			
		||||
        ops::RangeBounds,
 | 
			
		||||
        path::PathBuf,
 | 
			
		||||
        sync::{
 | 
			
		||||
            atomic::{AtomicUsize, Ordering},
 | 
			
		||||
            Arc, Mutex,
 | 
			
		||||
        },
 | 
			
		||||
    },
 | 
			
		||||
    blockhash_queue::BlockhashQueue,
 | 
			
		||||
    rent_collector::RentCollector,
 | 
			
		||||
    system_instruction_processor::{get_system_account_kind, SystemAccountKind},
 | 
			
		||||
};
 | 
			
		||||
use dashmap::{
 | 
			
		||||
    mapref::entry::Entry::{Occupied, Vacant},
 | 
			
		||||
    DashMap,
 | 
			
		||||
};
 | 
			
		||||
use log::*;
 | 
			
		||||
use rand::{thread_rng, Rng};
 | 
			
		||||
use solana_sdk::{
 | 
			
		||||
    account::{Account, AccountSharedData, ReadableAccount, WritableAccount},
 | 
			
		||||
    account_utils::StateMut,
 | 
			
		||||
    bpf_loader_upgradeable::{self, UpgradeableLoaderState},
 | 
			
		||||
    clock::{BankId, Slot, INITIAL_RENT_EPOCH},
 | 
			
		||||
    feature_set::{self, FeatureSet},
 | 
			
		||||
    genesis_config::ClusterType,
 | 
			
		||||
    hash::Hash,
 | 
			
		||||
    message::SanitizedMessage,
 | 
			
		||||
    native_loader,
 | 
			
		||||
    nonce::{state::Versions as NonceVersions, State as NonceState},
 | 
			
		||||
    pubkey::Pubkey,
 | 
			
		||||
    system_program, sysvar,
 | 
			
		||||
    sysvar::instructions::construct_instructions_data,
 | 
			
		||||
    transaction::{Result, SanitizedTransaction, TransactionError},
 | 
			
		||||
};
 | 
			
		||||
use std::{
 | 
			
		||||
    cmp::Reverse,
 | 
			
		||||
    collections::{hash_map, BinaryHeap, HashMap, HashSet},
 | 
			
		||||
    ops::RangeBounds,
 | 
			
		||||
    path::PathBuf,
 | 
			
		||||
    sync::atomic::{AtomicUsize, Ordering},
 | 
			
		||||
    sync::{Arc, Mutex},
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Default, AbiExample)]
 | 
			
		||||
@@ -1227,25 +1232,27 @@ pub fn update_accounts_bench(accounts: &Accounts, pubkeys: &[Pubkey], slot: u64)
 | 
			
		||||
 | 
			
		||||
#[cfg(test)]
 | 
			
		||||
mod tests {
 | 
			
		||||
    use super::*;
 | 
			
		||||
    use crate::rent_collector::RentCollector;
 | 
			
		||||
    use solana_sdk::{
 | 
			
		||||
        account::{AccountSharedData, WritableAccount},
 | 
			
		||||
        epoch_schedule::EpochSchedule,
 | 
			
		||||
        genesis_config::ClusterType,
 | 
			
		||||
        hash::Hash,
 | 
			
		||||
        instruction::{CompiledInstruction, InstructionError},
 | 
			
		||||
        message::Message,
 | 
			
		||||
        nonce, nonce_account,
 | 
			
		||||
        rent::Rent,
 | 
			
		||||
        signature::{keypair_from_seed, signers::Signers, Keypair, Signer},
 | 
			
		||||
        system_instruction, system_program,
 | 
			
		||||
        transaction::Transaction,
 | 
			
		||||
    };
 | 
			
		||||
    use std::{
 | 
			
		||||
        convert::TryFrom,
 | 
			
		||||
        sync::atomic::{AtomicBool, AtomicU64, Ordering},
 | 
			
		||||
        {thread, time},
 | 
			
		||||
    use {
 | 
			
		||||
        super::*,
 | 
			
		||||
        crate::rent_collector::RentCollector,
 | 
			
		||||
        solana_sdk::{
 | 
			
		||||
            account::{AccountSharedData, WritableAccount},
 | 
			
		||||
            epoch_schedule::EpochSchedule,
 | 
			
		||||
            genesis_config::ClusterType,
 | 
			
		||||
            hash::Hash,
 | 
			
		||||
            instruction::{CompiledInstruction, InstructionError},
 | 
			
		||||
            message::Message,
 | 
			
		||||
            nonce, nonce_account,
 | 
			
		||||
            rent::Rent,
 | 
			
		||||
            signature::{keypair_from_seed, signers::Signers, Keypair, Signer},
 | 
			
		||||
            system_instruction, system_program,
 | 
			
		||||
            transaction::Transaction,
 | 
			
		||||
        },
 | 
			
		||||
        std::{
 | 
			
		||||
            convert::TryFrom,
 | 
			
		||||
            sync::atomic::{AtomicBool, AtomicU64, Ordering},
 | 
			
		||||
            thread, time,
 | 
			
		||||
        },
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    fn new_sanitized_tx<T: Signers>(
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user