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

Merge pull request #660 from ethcore/poll_get

Browse Source 
Removing get prefix from poll_info
This commit is contained in:
Gav Wood 2016-03-10 15:24:09 +01:00
commit 29ddf34d6d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpc/src/v1/helpers/poll_manager.rs
View File

@ -84,7 +84,7 @@ impl<F, T> PollManager<F, T> where T: Timer {
} }
/// Returns number of block when last poll happend. /// Returns number of block when last poll happend.
pub fn get_poll_info(&mut self, id: &PollId) -> Option<&PollInfo<F>> { pub fn poll_info(&mut self, id: &PollId) -> Option<&PollInfo<F>> {
self.polls.prune(); self.polls.prune();
self.polls.get(id) self.polls.get(id)
} }
@ -124,21 +124,21 @@ mod tests {
*time.borrow_mut() = 10; *time.borrow_mut() = 10;
indexer.update_poll(&0, 21); indexer.update_poll(&0, 21);
assert_eq!(indexer.get_poll_info(&0).unwrap().filter, false); assert_eq!(indexer.poll_info(&0).unwrap().filter, false);
assert_eq!(indexer.get_poll_info(&0).unwrap().block_number, 21); assert_eq!(indexer.poll_info(&0).unwrap().block_number, 21);
*time.borrow_mut() = 30; *time.borrow_mut() = 30;
indexer.update_poll(&1, 23); indexer.update_poll(&1, 23);
assert_eq!(indexer.get_poll_info(&1).unwrap().filter, true); assert_eq!(indexer.poll_info(&1).unwrap().filter, true);
assert_eq!(indexer.get_poll_info(&1).unwrap().block_number, 23); assert_eq!(indexer.poll_info(&1).unwrap().block_number, 23);
*time.borrow_mut() = 75; *time.borrow_mut() = 75;
indexer.update_poll(&0, 30); indexer.update_poll(&0, 30);
assert!(indexer.get_poll_info(&0).is_none()); assert!(indexer.poll_info(&0).is_none());
assert_eq!(indexer.get_poll_info(&1).unwrap().filter, true); assert_eq!(indexer.poll_info(&1).unwrap().filter, true);
assert_eq!(indexer.get_poll_info(&1).unwrap().block_number, 23); assert_eq!(indexer.poll_info(&1).unwrap().block_number, 23);
indexer.remove_poll(&1); indexer.remove_poll(&1);
assert!(indexer.get_poll_info(&1).is_none()); assert!(indexer.poll_info(&1).is_none());
} }
} }

2
rpc/src/v1/impls/eth.rs
View File

@ -307,7 +307,7 @@ impl EthFilter for EthFilterClient {
let client = take_weak!(self.client); let client = take_weak!(self.client);
from_params::<(Index,)>(params) from_params::<(Index,)>(params)
.and_then(|(index,)| { .and_then(|(index,)| {
let info = self.polls.lock().unwrap().get_poll_info(&index.value()).cloned(); let info = self.polls.lock().unwrap().poll_info(&index.value()).cloned();
match info { match info {
None => Ok(Value::Array(vec![] as Vec<Value>)), None => Ok(Value::Array(vec![] as Vec<Value>)),
Some(info) => match info.filter { Some(info) => match info.filter {