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

Fix getProgramAccounts RPC (#5024)

Browse Source 
* Use scan_accounts to load accounts by program_id

* Add bank test

* Use get_program_accounts in RPC
This commit is contained in:
Tyera Eulberg
2019-07-11 12:58:28 -06:00
committed by GitHub
parent 2c8d6f87e6
commit b2c776eabc
3 changed files with 80 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runtime/src/accounts.rs
View File

@@ -338,7 +338,7 @@ impl Accounts {
.collect()
}
pub fn load_by_program(&self, fork: Fork, program_id: &Pubkey) -> Vec<(Pubkey, Account)> {
pub fn load_by_program_fork(&self, fork: Fork, program_id: &Pubkey) -> Vec<(Pubkey, Account)> {
self.scan_fork(fork, |stored_account| {
if stored_account.balance.owner == *program_id {
Some((stored_account.meta.pubkey, stored_account.clone_account()))
@@ -348,6 +348,24 @@ impl Accounts {
})
}
pub fn load_by_program(
&self,
ancestors: &HashMap<Fork, usize>,
program_id: &Pubkey,
) -> Vec<(Pubkey, Account)> {
self.accounts_db.scan_accounts(
ancestors,
|collector: &mut Vec<(Pubkey, Account)>, option| {
if let Some(data) = option
.filter(|(_, account, _)| account.owner == *program_id && account.lamports != 0)
.map(|(pubkey, account, _fork)| (*pubkey, account))
{
collector.push(data)
}
},
)
}
/// Slow because lock is held for 1 operation instead of many
pub fn store_slow(&self, fork: Fork, pubkey: &Pubkey, account: &Account) {
let mut accounts = HashMap::new();
@@ -1050,7 +1068,7 @@ mod tests {
}
#[test]
fn test_load_by_program() {
fn test_load_by_program_fork() {
let accounts = Accounts::new(None);
// Load accounts owned by various programs into AccountsDB
@@ -1064,11 +1082,11 @@ mod tests {
let account2 = Account::new(1, 0, &Pubkey::new(&[3; 32]));
accounts.store_slow(0, &pubkey2, &account2);
let loaded = accounts.load_by_program(0, &Pubkey::new(&[2; 32]));
let loaded = accounts.load_by_program_fork(0, &Pubkey::new(&[2; 32]));
assert_eq!(loaded.len(), 2);
let loaded = accounts.load_by_program(0, &Pubkey::new(&[3; 32]));
let loaded = accounts.load_by_program_fork(0, &Pubkey::new(&[3; 32]));
assert_eq!(loaded, vec![(pubkey2, account2)]);
let loaded = accounts.load_by_program(0, &Pubkey::new(&[4; 32]));
let loaded = accounts.load_by_program_fork(0, &Pubkey::new(&[4; 32]));
assert_eq!(loaded, vec![]);
}