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

SecretStore: removed extra-tracing

Browse Source
This commit is contained in:
Svyatoslav Nikolsky 2017-12-21 16:20:34 +03:00
parent 9104d4673c
commit 8d15338c84
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
secret_store/src/listener/service_contract.rs
View File

@ -174,8 +174,8 @@ impl ServiceContract for OnChainServiceContract {
// read server key generation requests // read server key generation requests
let request_logs = client.logs(Filter { let request_logs = client.logs(Filter {
from_block: BlockId::Hash(first_block.clone()), from_block: BlockId::Hash(first_block),
to_block: BlockId::Hash(last_block.clone()), to_block: BlockId::Hash(last_block),
address: Some(vec![address]), address: Some(vec![address]),
topics: vec![ topics: vec![
Some(vec![*SERVER_KEY_REQUESTED_EVENT_NAME_HASH]), Some(vec![*SERVER_KEY_REQUESTED_EVENT_NAME_HASH]),
@ -186,20 +186,13 @@ impl ServiceContract for OnChainServiceContract {
limit: None, limit: None,
}); });
trace!(target: "secretstore", "{}: read {} events from service contract in blocks {}..{}",
self.self_key_pair.public(), request_logs.len(), first_block, last_block);
Box::new(request_logs.into_iter().map(|log| log.entry.topics)) Box::new(request_logs.into_iter().map(|log| log.entry.topics))
} }
fn read_pending_requests(&self) -> Box<Iterator<Item=(bool, ServiceTask)>> { fn read_pending_requests(&self) -> Box<Iterator<Item=(bool, ServiceTask)>> {
let client = match self.client.get() { let client = match self.client.get() {
Some(client) => client, Some(client) => client,
None => { None => return Box::new(::std::iter::empty()),
warn!(target: "secretstore", "{}: client is untrusted during read_pending_requests call",
self.self_key_pair.public());
return Box::new(::std::iter::empty());
},
}; };
// we only need requests that are here for more than REQUEST_CONFIRMATIONS_REQUIRED blocks // we only need requests that are here for more than REQUEST_CONFIRMATIONS_REQUIRED blocks