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

simplified filter iterators

Browse Source
This commit is contained in:
debris 2016-02-24 10:35:05 +01:00
parent 394e57d3ce
commit ca251215cf
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ethcore/src/filter.rs
View File

@ -57,30 +57,26 @@ impl Filter {
self.topics.iter().fold(blooms, | bs, topic | match *topic { self.topics.iter().fold(blooms, | bs, topic | match *topic {
None => bs, None => bs,
Some(ref topics) => bs.into_iter().map(|bloom| { Some(ref topics) => bs.into_iter().flat_map(|bloom| {
topics.into_iter().map(|topic| { topics.into_iter().map(|topic| {
let mut b = bloom.clone(); let mut b = bloom.clone();
b.shift_bloomed(&topic.sha3()); b.shift_bloomed(&topic.sha3());
b b
}).collect::<Vec<H2048>>() }).collect::<Vec<H2048>>()
}).flat_map(|m| m).collect() }).collect()
}) })
} }
/// Returns true if given log entry matches filter. /// Returns true if given log entry matches filter.
pub fn matches(&self, log: &LogEntry) -> bool { pub fn matches(&self, log: &LogEntry) -> bool {
let matches = match self.address { let matches = match self.address {
Some(ref addresses) if !addresses.is_empty() => addresses.iter().fold(false, |res, address| { Some(ref addresses) if !addresses.is_empty() => addresses.iter().any(|address| &log.address == address),
res || &log.address == address
}),
_ => true _ => true
}; };
matches && self.topics.iter().enumerate().fold(true, |res, (i, topic)| match *topic { matches && self.topics.iter().enumerate().all(|(i, topic)| match *topic {
Some(ref topics) if !topics.is_empty() => res && topics.iter().fold(false, | acc, topic | { Some(ref topics) if !topics.is_empty() => topics.iter().any(|topic| log.topics.get(i) == Some(topic)),
acc || log.topics.get(i) == Some(topic) _ => true
}),
_ => res,
}) })
} }
} }