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

bank: factor tx log getter out to method on TransactionLogCollector

Browse Source
This commit is contained in:
Trent Nelson
2021-11-24 13:40:11 -07:00
committed by mergify[bot]
parent 69e1b68fbb
commit efedb55705
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
runtime/src/bank.rs
View File

@ -575,6 +575,21 @@ pub struct TransactionLogCollector {
pub mentioned_address_map: HashMap<Pubkey, Vec<usize>>, pub mentioned_address_map: HashMap<Pubkey, Vec<usize>>,
} }
impl TransactionLogCollector {
pub fn get_logs_for_address(
&self,
address: Option<&Pubkey>,
) -> Option<Vec<TransactionLogInfo>> {
match address {
None => Some(self.logs.clone()),
Some(address) => self
.mentioned_address_map
.get(address)
.map(|log_indices| log_indices.iter().map(|i| self.logs[*i].clone()).collect()),
}
}
}
pub trait NonceInfo { pub trait NonceInfo {
fn address(&self) -> &Pubkey; fn address(&self) -> &Pubkey;
fn account(&self) -> &AccountSharedData; fn account(&self) -> &AccountSharedData;
@ -5302,20 +5317,10 @@ impl Bank {
&self, &self,
address: Option<&Pubkey>, address: Option<&Pubkey>,
) -> Option<Vec<TransactionLogInfo>> { ) -> Option<Vec<TransactionLogInfo>> {
let transaction_log_collector = self.transaction_log_collector.read().unwrap(); self.transaction_log_collector
.read()
match address { .unwrap()
None => Some(transaction_log_collector.logs.clone()), .get_logs_for_address(address)
Some(address) => transaction_log_collector
.mentioned_address_map
.get(address)
.map(|log_indices| {
log_indices
.iter()
.map(|i| transaction_log_collector.logs[*i].clone())
.collect()
}),
}
} }
pub fn get_all_accounts_modified_since_parent(&self) -> Vec<(Pubkey, AccountSharedData)> { pub fn get_all_accounts_modified_since_parent(&self) -> Vec<(Pubkey, AccountSharedData)> {