Minor renaming diff -> state_diff

This commit is contained in:
Gav Wood
2016-06-02 12:39:25 +02:00
parent bc5c3da2af
commit b9ec87548d
8 changed files with 19 additions and 19 deletions

View File

@@ -464,9 +464,9 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
let options = TransactOptions { tracing: false, vm_tracing: analytics.vm_tracing, check_nonce: false };
let mut ret = Executive::new(&mut state, &env_info, self.engine.deref().deref(), &self.vm_factory).transact(t, options);
// TODO gav move this into Executive.
if analytics.diffing {
if analytics.state_diffing {
if let Ok(ref mut x) = ret {
x.diff = Some(state.diff_from(self.state()));
x.state_diff = Some(state.diff_from(self.state()));
}
}
ret

View File

@@ -55,7 +55,7 @@ pub struct CallAnalytics {
/// Make a VM trace.
pub vm_tracing: bool,
/// Make a diff.
pub diffing: bool,
pub state_diffing: bool,
}
/// Blockchain database client. Owns and manages a blockchain and a block queue.

View File

@@ -450,7 +450,7 @@ impl<'a> Executive<'a> {
output: output,
trace: trace,
vm_trace: vm_trace,
diff: None,
state_diff: None,
})
},
_ => {
@@ -464,7 +464,7 @@ impl<'a> Executive<'a> {
output: output,
trace: trace,
vm_trace: vm_trace,
diff: None,
state_diff: None,
})
},
}

View File

@@ -280,9 +280,9 @@ impl MinerService for Miner {
let mut ret = Executive::new(&mut state, &env_info, self.engine(), chain.vm_factory()).transact(t, options);
// TODO gav move this into Executive.
if analytics.diffing {
if analytics.state_diffing {
if let Ok(ref mut x) = ret {
x.diff = Some(state.diff_from(block.state().clone()));
x.state_diff = Some(state.diff_from(block.state().clone()));
}
}
ret

View File

@@ -63,7 +63,7 @@ pub struct Executed {
/// The VM trace of this transaction.
pub vm_trace: Option<VMTrace>,
/// The state diff, if we traced it.
pub diff: Option<StateDiff>,
pub state_diff: Option<StateDiff>,
}
/// Result of executing the transaction.