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

removed redundant otry! macro from ethcore (#7916)

Browse Source 
* removed redundant otry! macro from ethcore

* removed redundant otry! macro from parity
This commit is contained in:
Marek Kotewicz
2018-02-16 16:37:12 +01:00
committed by GitHub
parent c6b931766c
commit 899dd0ff4b
4 changed files with 156 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ethcore/src/blockchain/blockchain.rs
View File

@@ -156,10 +156,6 @@ pub trait BlockProvider {
where F: Fn(&LogEntry) -> bool + Send + Sync, Self: Sized;
}
macro_rules! otry {
($e:expr) => { match $e { Some(x) => x, None => return None } }
}
#[derive(Debug, Hash, Eq, PartialEq, Clone)]
enum CacheId {
BlockHeader(H256),
@@ -722,8 +718,8 @@ impl BlockChain {
let mut from_branch = vec![];
let mut to_branch = vec![];
let mut from_details = otry!(self.block_details(&from));
let mut to_details = otry!(self.block_details(&to));
let mut from_details = self.block_details(&from)?;
let mut to_details = self.block_details(&to)?;
let mut current_from = from;
let mut current_to = to;
@@ -731,13 +727,13 @@ impl BlockChain {
while from_details.number > to_details.number {
from_branch.push(current_from);
current_from = from_details.parent.clone();
from_details = otry!(self.block_details(&from_details.parent));
from_details = self.block_details(&from_details.parent)?;
}
while to_details.number > from_details.number {
to_branch.push(current_to);
current_to = to_details.parent.clone();
to_details = otry!(self.block_details(&to_details.parent));
to_details = self.block_details(&to_details.parent)?;
}
assert_eq!(from_details.number, to_details.number);
@@ -746,11 +742,11 @@ impl BlockChain {
while current_from != current_to {
from_branch.push(current_from);
current_from = from_details.parent.clone();
from_details = otry!(self.block_details(&from_details.parent));
from_details = self.block_details(&from_details.parent)?;
to_branch.push(current_to);
current_to = to_details.parent.clone();
to_details = otry!(self.block_details(&to_details.parent));
to_details = self.block_details(&to_details.parent)?;
}
let index = from_branch.len();
@@ -912,8 +908,8 @@ impl BlockChain {
/// The block corresponding the the parent hash must be stored already.
pub fn epoch_transition_for(&self, parent_hash: H256) -> Option<EpochTransition> {
// slow path: loop back block by block
for hash in otry!(self.ancestry_iter(parent_hash)) {
let details = otry!(self.block_details(&hash));
for hash in self.ancestry_iter(parent_hash)? {
let details = self.block_details(&hash)?;
// look for transition in database.
if let Some(transition) = self.epoch_transition(details.number, hash) {
@@ -925,7 +921,7 @@ impl BlockChain {
//
// if `block_hash` is canonical it will only return transitions up to
// the parent.
if otry!(self.block_hash(details.number)) == hash {
if self.block_hash(details.number)? == hash {
return self.epoch_transitions()
.map(|(_, t)| t)
.take_while(|t| t.block_number <= details.number)

21
ethcore/src/engines/authority_round/mod.rs
View File

@@ -412,19 +412,10 @@ impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
}
fn check_finality_proof(&self, proof: &[u8]) -> Option<Vec<H256>> {
macro_rules! otry {
($e: expr) => {
match $e {
Some(x) => x,
None => return None,
}
}
}
let mut finality_checker = RollingFinality::blank(self.subchain_validators.clone().into_inner());
let mut finalized = Vec::new();
let headers: Vec<Header> = otry!(UntrustedRlp::new(proof).as_list().ok());
let headers: Vec<Header> = UntrustedRlp::new(proof).as_list().ok()?;
{
let mut push_header = |parent_header: &Header, header: Option<&Header>| {
@@ -438,26 +429,26 @@ impl super::EpochVerifier<EthereumMachine> for EpochVerifier {
}
// `verify_external` checks that signature is correct and author == signer.
otry!(verify_external(parent_header, &self.subchain_validators, self.empty_steps_transition).ok());
verify_external(parent_header, &self.subchain_validators, self.empty_steps_transition).ok()?;
let mut signers = match header {
Some(header) => otry!(header_empty_steps_signers(header, self.empty_steps_transition).ok()),
Some(header) => header_empty_steps_signers(header, self.empty_steps_transition).ok()?,
_ => Vec::new(),
};
signers.push(parent_header.author().clone());
let newly_finalized = otry!(finality_checker.push_hash(parent_header.hash(), signers).ok());
let newly_finalized = finality_checker.push_hash(parent_header.hash(), signers).ok()?;
finalized.extend(newly_finalized);
Some(())
};
for window in headers.windows(2) {
otry!(push_header(&window[0], Some(&window[1])));
push_header(&window[0], Some(&window[1]))?;
}
if let Some(last) = headers.last() {
otry!(push_header(last, None));
push_header(last, None)?;
}
}