grassrootseconomics/openethereum
5
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/src/engines/mod.rs
View File

@ -484,7 +484,7 @@ pub mod common {
fields.traces.as_mut().map(|mut traces| { fields.traces.as_mut().map(|mut traces| {
let mut tracer = ExecutiveTracer::default(); let mut tracer = ExecutiveTracer::default();
tracer.trace_reward(block_author, engine.params().block_reward, RewardType::Block); tracer.trace_reward(block_author, engine.params().block_reward, RewardType::Block);
traces.push(tracer.traces()) traces.push(tracer.drain())
}); });
// Commit state so that we can actually figure out the state root. // Commit state so that we can actually figure out the state root.

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

@ -109,7 +109,7 @@ impl Engine for NullEngine {
fields.state.commit()?; fields.state.commit()?;
if tracing_enabled { 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(()) Ok(())
} }

2
ethcore/src/ethereum/ethash.rs
View File

@ -338,7 +338,7 @@ impl Engine for Arc<Ethash> {
// Commit state so that we can actually figure out the state root. // Commit state so that we can actually figure out the state root.
fields.state.commit()?; fields.state.commit()?;
if tracing_enabled { 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(()) Ok(())
} }

22
ethcore/src/trace/types/trace.rs
View File

@ -219,28 +219,6 @@ impl Suicide {
} }
} }
impl Encodable for Suicide {
fn rlp_append(&self, s: &mut RlpStream) {
s.begin_list(3);
s.append(&self.address);
s.append(&self.refund_address);
s.append(&self.balance);
}
}
impl Decodable for Suicide {
fn decode(rlp: &UntrustedRlp) -> Result<Self, DecoderError> {
let res = Suicide {
address: rlp.val_at(0)?,
refund_address: rlp.val_at(1)?,
balance: rlp.val_at(2)?,
};
Ok(res)
}
}
/// Description of an action that we trace; will be either a call or a create. /// Description of an action that we trace; will be either a call or a create.
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "ipc", binary)] #[cfg_attr(feature = "ipc", binary)]