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

Fixed comments after the review

Browse Source
This commit is contained in:
Anton Gavrilov
2017-08-02 17:10:06 +02:00
parent 141c2fd34a
commit 2e840bc89c
11 changed files with 61 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ethcore/src/engines/tendermint/mod.rs
View File

@@ -540,6 +540,7 @@ impl Engine for Tendermint {
/// Apply the block reward on finalisation of the block.
fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<CloseOutcome, Error>{
let tracing_enabled = block.tracing_enabled();
let fields = block.fields_mut();
let mut tracer = ExecutiveTracer::default();
// Bestow block reward
@@ -548,22 +549,22 @@ impl Engine for Tendermint {
.map_err(::error::Error::from)
.and_then(|_| fields.state.commit());
// Trace it
let block_miner = fields.header.author().clone();
tracer.trace_reward(block_miner, self.params().block_reward, RewardType::Block);
if tracing_enabled {
let block_author = fields.header.author().clone();
tracer.trace_reward(block_author, self.params().block_reward, RewardType::Block);
}
// Commit state so that we can actually figure out the state root.
if let Err(ref e) = res {
warn!("Encountered error on closing block: {}", e);
}
match res {
Ok(_) => match *fields.tracing_enabled {
true => Ok(CloseOutcome{trace: Some(tracer.traces())}),
false => Ok(CloseOutcome{trace: None})
Ok(_) => match tracing_enabled {
true => Ok(CloseOutcome { trace: Some(tracer.traces()) } ),
false => Ok(CloseOutcome { trace: None } )
},
Err(e) => Err(e)
}
}
fn verify_block_basic(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {