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

code cleanup with macro

Browse Source
This commit is contained in:
Robert Habermeier 2017-05-12 18:00:01 +02:00
parent 2a6f38c587
commit f8279bb7bb
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ethcore/light/src/on_demand/request.rs
View File

@ -264,6 +264,20 @@ impl CheckedRequest {
} }
} }
macro_rules! match_me {
($me: expr, ($check: pat, $req: pat) => $e: expr) => {
match $me {
CheckedRequest::HeaderProof($check, $req) => $e,
CheckedRequest::HeaderByHash($check, $req) => $e,
CheckedRequest::Receipts($check, $req) => $e,
CheckedRequest::Body($check, $req) => $e,
CheckedRequest::Account($check, $req) => $e,
CheckedRequest::Code($check, $req) => $e,
CheckedRequest::Execution($check, $req) => $e,
}
}
}
impl IncompleteRequest for CheckedRequest { impl IncompleteRequest for CheckedRequest {
type Complete = net_request::CompleteRequest; type Complete = net_request::CompleteRequest;
type Response = net_request::Response; type Response = net_request::Response;
@ -275,28 +289,12 @@ impl IncompleteRequest for CheckedRequest {
fn check_outputs<F>(&self, f: F) -> Result<(), net_request::NoSuchOutput> fn check_outputs<F>(&self, f: F) -> Result<(), net_request::NoSuchOutput>
where F: FnMut(usize, usize, OutputKind) -> Result<(), net_request::NoSuchOutput> where F: FnMut(usize, usize, OutputKind) -> Result<(), net_request::NoSuchOutput>
{ {
match *self { match_me!(*self, (_, ref req) => req.check_outputs(f))
CheckedRequest::HeaderProof(_, ref req) => req.check_outputs(f),
CheckedRequest::HeaderByHash(_, ref req) => req.check_outputs(f),
CheckedRequest::Receipts(_, ref req) => req.check_outputs(f),
CheckedRequest::Body(_, ref req) => req.check_outputs(f),
CheckedRequest::Account(_, ref req) => req.check_outputs(f),
CheckedRequest::Code(_, ref req) => req.check_outputs(f),
CheckedRequest::Execution(_, ref req) => req.check_outputs(f),
}
} }
/// Note that this request will produce the following outputs. /// Note that this request will produce the following outputs.
fn note_outputs<F>(&self, f: F) where F: FnMut(usize, OutputKind) { fn note_outputs<F>(&self, f: F) where F: FnMut(usize, OutputKind) {
match *self { match_me!(*self, (_, ref req) => req.note_outputs(f))
CheckedRequest::HeaderProof(_, ref req) => req.note_outputs(f),
CheckedRequest::HeaderByHash(_, ref req) => req.note_outputs(f),
CheckedRequest::Receipts(_, ref req) => req.note_outputs(f),
CheckedRequest::Body(_, ref req) => req.note_outputs(f),
CheckedRequest::Account(_, ref req) => req.note_outputs(f),
CheckedRequest::Code(_, ref req) => req.note_outputs(f),
CheckedRequest::Execution(_, ref req) => req.note_outputs(f),
}
} }
/// Fill fields of the request. /// Fill fields of the request.
@ -305,15 +303,7 @@ impl IncompleteRequest for CheckedRequest {
/// prior request outputs. /// prior request outputs.
/// Only outputs previously checked with `check_outputs` may be available. /// Only outputs previously checked with `check_outputs` may be available.
fn fill<F>(&mut self, f: F) where F: Fn(usize, usize) -> Result<Output, net_request::NoSuchOutput> { fn fill<F>(&mut self, f: F) where F: Fn(usize, usize) -> Result<Output, net_request::NoSuchOutput> {
match *self { match_me!(*self, (_, ref mut req) => req.fill(f))
CheckedRequest::HeaderProof(_, ref mut req) => req.fill(f),
CheckedRequest::HeaderByHash(_, ref mut req) => req.fill(f),
CheckedRequest::Receipts(_, ref mut req) => req.fill(f),
CheckedRequest::Body(_, ref mut req) => req.fill(f),
CheckedRequest::Account(_, ref mut req) => req.fill(f),
CheckedRequest::Code(_, ref mut req) => req.fill(f),
CheckedRequest::Execution(_, ref mut req) => req.fill(f),
}
} }
/// Will succeed if all fields have been filled, will fail otherwise. /// Will succeed if all fields have been filled, will fail otherwise.
@ -333,15 +323,7 @@ impl IncompleteRequest for CheckedRequest {
fn adjust_refs<F>(&mut self, mapping: F) where F: FnMut(usize) -> usize { fn adjust_refs<F>(&mut self, mapping: F) where F: FnMut(usize) -> usize {
match *self { match_me!(*self, (_, ref mut req) => req.adjust_refs(mapping))
CheckedRequest::HeaderProof(_, ref mut req) => req.adjust_refs(mapping),
CheckedRequest::HeaderByHash(_, ref mut req) => req.adjust_refs(mapping),
CheckedRequest::Receipts(_, ref mut req) => req.adjust_refs(mapping),
CheckedRequest::Body(_, ref mut req) => req.adjust_refs(mapping),
CheckedRequest::Account(_, ref mut req) => req.adjust_refs(mapping),
CheckedRequest::Code(_, ref mut req) => req.adjust_refs(mapping),
CheckedRequest::Execution(_, ref mut req) => req.adjust_refs(mapping),
}
} }
} }