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

38
ethcore/src/trace/db.rs
View File

@@ -215,20 +215,11 @@ impl<T> TraceDB<T> where T: DatabaseExtras {
block_number: BlockNumber,
tx_number: usize
) -> Vec<LocalizedTrace> {
let trace_tx_number;
let trace_tx_hash;
match self.extras.transaction_hash(block_number, tx_number) {
Some(hash) => {
trace_tx_hash = Some(hash.clone());
trace_tx_number = Some(tx_number);
},
None => {
//None means trace without transaction (reward)
trace_tx_hash = None;
trace_tx_number = None;
}
}
let (trace_tx_number, trace_tx_hash) = match self.extras.transaction_hash(block_number, tx_number) {
Some(hash) => (Some(tx_number), Some(hash.clone())),
//None means trace without transaction (reward)
None => (None, None),
};
let flat_traces: Vec<FlatTrace> = traces.into();
flat_traces.into_iter()
@@ -375,20 +366,11 @@ impl<T> TraceDatabase for TraceDB<T> where T: DatabaseExtras {
.map(Into::<Vec<FlatTrace>>::into)
.enumerate()
.flat_map(|(tx_position, traces)| {
let trace_tx_number;
let trace_tx_hash;
match self.extras.transaction_hash(block_number, tx_position) {
Some(hash) => {
trace_tx_hash = Some(hash.clone());
trace_tx_number = Some(tx_position);
},
None => {
//None means trace without transaction (reward)
trace_tx_hash = None;
trace_tx_number = None;
}
}
let (trace_tx_number, trace_tx_hash) = match self.extras.transaction_hash(block_number, tx_position) {
Some(hash) => (Some(tx_position), Some(hash.clone())),
//None means trace without transaction (reward)
None => (None, None),
};
traces.into_iter()
.map(|trace| LocalizedTrace {

4
ethcore/src/trace/executive_tracer.rs
View File

@@ -159,7 +159,7 @@ impl Tracer for ExecutiveTracer {
result: Res::None,
trace_address: Default::default(),
};
debug!(target: "trace", "Traced failed suicide {:?}", trace);
debug!(target: "trace", "Traced suicide {:?}", trace);
self.traces.push(trace);
}
@@ -174,7 +174,7 @@ impl Tracer for ExecutiveTracer {
result: Res::None,
trace_address: Default::default(),
};
debug!(target: "trace", "Traced failed reward {:?}", trace);
debug!(target: "trace", "Traced reward {:?}", trace);
self.traces.push(trace);
}