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

Optimize Message::is_non_loader_key method (#18579)

Browse Source
This commit is contained in:
Justin Starry
2021-07-12 10:42:22 -05:00
committed by GitHub
parent 12aa238eb1
commit e806d31224
4 changed files with 25 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/src/accounts.rs
View File

@ -28,7 +28,7 @@ use solana_sdk::{
fee_calculator::FeeCalculator,
genesis_config::ClusterType,
hash::Hash,
message::{Message, MessageProgramIdsCache},
message::Message,
native_loader, nonce,
pubkey::Pubkey,
transaction::Result,
@ -208,12 +208,11 @@ impl Accounts {
let mut tx_rent: TransactionRent = 0;
let mut accounts = Vec::with_capacity(message.account_keys.len());
let mut account_deps = Vec::with_capacity(message.account_keys.len());
let mut key_check = MessageProgramIdsCache::new(message);
let mut rent_debits = RentDebits::default();
let rent_for_sysvars = feature_set.is_active(&feature_set::rent_for_sysvars::id());
for (i, key) in message.account_keys.iter().enumerate() {
let account = if key_check.is_non_loader_key(key, i) {
let account = if message.is_non_loader_key(i) {
if payer_index.is_none() {
payer_index = Some(i);
}
@ -981,7 +980,7 @@ impl Accounts {
let mut fee_payer_index = None;
for (i, (key, account)) in (0..message.account_keys.len())
.zip(loaded_transaction.accounts.iter_mut())
.filter(|(i, (key, _account))| message.is_non_loader_key(key, *i))
.filter(|(i, _account)| message.is_non_loader_key(*i))
{
let is_nonce_account = prepare_if_nonce_account(
account,

2
runtime/src/bank.rs
View File

@ -632,7 +632,7 @@ impl NonceRollbackFull {
} = partial;
let fee_payer = (0..message.account_keys.len()).find_map(|i| {
if let Some((k, a)) = &accounts.get(i) {
if message.is_non_loader_key(k, i) {
if message.is_non_loader_key(i) {
return Some((k, a));
}
}