gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adhere to naming conventions (#10530)

Browse Source 
automerge
This commit is contained in:
Jack May
2020-06-11 19:10:34 -07:00
committed by GitHub
parent 914f285914
commit 4f761395d2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/bank.rs
View File

@ -1304,8 +1304,7 @@ impl Bank {
/// Converts Accounts into RefCell<Account>, this involves moving /// Converts Accounts into RefCell<Account>, this involves moving
/// ownership by draining the source /// ownership by draining the source
#[allow(clippy::wrong_self_convention)] fn accounts_to_refcells(
fn into_refcells(
accounts: &mut TransactionAccounts, accounts: &mut TransactionAccounts,
loaders: &mut TransactionLoaders, loaders: &mut TransactionLoaders,
) -> (TransactionAccountRefCells, TransactionLoaderRefCells) { ) -> (TransactionAccountRefCells, TransactionLoaderRefCells) {
@ -1326,7 +1325,7 @@ impl Bank {
/// Converts back from RefCell<Account> to Account, this involves moving /// Converts back from RefCell<Account> to Account, this involves moving
/// ownership by draining the sources /// ownership by draining the sources
fn from_refcells( fn refcells_to_accounts(
accounts: &mut TransactionAccounts, accounts: &mut TransactionAccounts,
loaders: &mut TransactionLoaders, loaders: &mut TransactionLoaders,
mut account_refcells: TransactionAccountRefCells, mut account_refcells: TransactionAccountRefCells,
@ -1402,7 +1401,7 @@ impl Bank {
signature_count += u64::from(tx.message().header.num_required_signatures); signature_count += u64::from(tx.message().header.num_required_signatures);
let (account_refcells, loader_refcells) = let (account_refcells, loader_refcells) =
Self::into_refcells(accounts, loaders); Self::accounts_to_refcells(accounts, loaders);
let process_result = self.message_processor.process_message( let process_result = self.message_processor.process_message(
tx.message(), tx.message(),
@ -1412,7 +1411,12 @@ impl Bank {
log_collector, log_collector,
); );
Self::from_refcells(accounts, loaders, account_refcells, loader_refcells); Self::refcells_to_accounts(
accounts,
loaders,
account_refcells,
loader_refcells,
);
if let Err(TransactionError::InstructionError(_, _)) = &process_result { if let Err(TransactionError::InstructionError(_, _)) = &process_result {
error_counters.instruction_error += 1; error_counters.instruction_error += 1;