grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor parity_listStorageKeys with count parameter optional (#11124)

Browse Source
This commit is contained in:
Juan Aguilar
2019-10-04 14:38:57 +02:00
committed by Andronik Ordian
parent 79aeb95272
commit 4fd1ec643f
7 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ethcore/src/client/client.rs
View File

@@ -1805,7 +1805,7 @@ impl BlockChainClient for Client {
Some(accounts)
}
fn list_storage(&self, id: BlockId, account: &Address, after: Option<&H256>, count: u64) -> Option<Vec<H256>> {
fn list_storage(&self, id: BlockId, account: &Address, after: Option<&H256>, count: Option<u64>) -> Option<Vec<H256>> {
if !self.factories.trie.is_fat() {
trace!(target: "fatdb", "list_storage: Not a fat DB");
return None;
@@ -1846,9 +1846,16 @@ impl BlockChainClient for Client {
}
}
let keys = iter.filter_map(|item| {
item.ok().map(|(key, _)| H256::from_slice(&key))
}).take(count as usize).collect();
let keys = {
let f = iter.filter_map(|item| {
item.ok().map(|(key, _)| H256::from_slice(&key))
});
if let Some(count) = count {
f.take(count as usize).collect()
} else {
f.collect()
}
};
Some(keys)
}

2
ethcore/src/test_helpers/test_client.rs
View File

@@ -735,7 +735,7 @@ impl BlockChainClient for TestBlockChainClient {
None
}
fn list_storage(&self, _id: BlockId, _account: &Address, _after: Option<&H256>, _count: u64) -> Option<Vec<H256>> {
fn list_storage(&self, _id: BlockId, _account: &Address, _after: Option<&H256>, _count: Option<u64>) -> Option<Vec<H256>> {
None
}
fn transaction(&self, _id: TransactionId) -> Option<LocalizedTransaction> {