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

UsingQueue: Tests for new function, remove unused function.

Browse Source
This commit is contained in:
Gav Wood 2016-03-24 23:15:51 +01:00
parent d50c9f9fac
commit c99a486826
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/src/using_queue.rs
View File

@ -68,16 +68,6 @@ impl<T> UsingQueue<T> where T: Clone {
self.in_use.clear(); self.in_use.clear();
} }
/// Returns `Some` reference to first block that `f` returns `true` with it as a parameter
/// or `None` if no such block exists in the queue.
pub fn find_if<P>(&self, predicate: P) -> Option<&T> where P: Fn(&T) -> bool {
if self.pending.as_ref().map(|r| predicate(r)).unwrap_or(false) {
self.pending.as_ref()
} else {
self.in_use.iter().find(|r| predicate(r))
}
}
/// Returns `Some` item which is the first that `f` returns `true` with a reference to it /// Returns `Some` item which is the first that `f` returns `true` with a reference to it
/// as a parameter or `None` if no such item exists in the queue. /// as a parameter or `None` if no such item exists in the queue.
pub fn take_used_if<P>(&mut self, predicate: P) -> Option<T> where P: Fn(&T) -> bool { pub fn take_used_if<P>(&mut self, predicate: P) -> Option<T> where P: Fn(&T) -> bool {
@ -107,7 +97,7 @@ impl<T> UsingQueue<T> where T: Clone {
fn should_find_when_pushed() { fn should_find_when_pushed() {
let mut q = UsingQueue::new(2); let mut q = UsingQueue::new(2);
q.push(1); q.push(1);
assert!(q.find_if(|i| i == &1).is_some()); assert!(q.take_used_if(|i| i == &1).is_none());
} }
#[test] #[test]
@ -115,7 +105,7 @@ fn should_find_when_pushed_and_used() {
let mut q = UsingQueue::new(2); let mut q = UsingQueue::new(2);
q.push(1); q.push(1);
q.use_last_ref(); q.use_last_ref();
assert!(q.find_if(|i| i == &1).is_some()); assert!(q.take_used_if(|i| i == &1).is_some());
} }
#[test] #[test]
@ -125,7 +115,7 @@ fn should_find_when_others_used() {
q.use_last_ref(); q.use_last_ref();
q.push(2); q.push(2);
q.use_last_ref(); q.use_last_ref();
assert!(q.find_if(|i| i == &1).is_some()); assert!(q.take_used_if(|i| i == &1).is_some());
} }
#[test] #[test]
@ -135,7 +125,7 @@ fn should_not_find_when_too_many_used() {
q.use_last_ref(); q.use_last_ref();
q.push(2); q.push(2);
q.use_last_ref(); q.use_last_ref();
assert!(q.find_if(|i| i == &1).is_none()); assert!(q.take_used_if(|i| i == &1).is_none());
} }
#[test] #[test]
@ -144,7 +134,7 @@ fn should_not_find_when_not_used_and_then_pushed() {
q.push(1); q.push(1);
q.push(2); q.push(2);
q.use_last_ref(); q.use_last_ref();
assert!(q.find_if(|i| i == &1).is_none()); assert!(q.take_used_if(|i| i == &1).is_none());
} }
#[test] #[test]
@ -174,7 +164,7 @@ fn should_not_find_when_not_used_peeked_and_then_pushed() {
q.peek_last_ref(); q.peek_last_ref();
q.push(2); q.push(2);
q.use_last_ref(); q.use_last_ref();
assert!(q.find_if(|i| i == &1).is_none()); assert!(q.take_used_if(|i| i == &1).is_none());
} }
#[test] #[test]