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

fixed merge

Browse Source
This commit is contained in:
debris
2017-08-30 14:37:02 +02:00
parent 88200a1193
commit 8a420d6580
4 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ethcore/src/engines/null_engine.rs
View File

@@ -78,7 +78,7 @@ impl Engine for NullEngine {
/// Block reward
let tracing_enabled = block.tracing_enabled();
let fields = block.fields_mut();
let fields = block.fields_mut();
let mut tracer = ExecutiveTracer::default();
let result_block_reward = U256::from(1000000000);
@@ -104,12 +104,12 @@ impl Engine for NullEngine {
)?;
if tracing_enabled {
tracer.trace_reward(uncle_author, result_uncle_reward, RewardType::Uncle);
}
}
}
fields.state.commit()?;
if tracing_enabled {
fields.traces.as_mut().map(|mut traces| traces.push(tracer.traces()));
fields.traces.as_mut().map(|mut traces| traces.push(tracer.drain()));
}
Ok(())
}