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

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

4
ethcore/src/client/client.rs
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

2
ethcore/src/client/mod.rs
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.

4
ethcore/src/executive.rs
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,
})
},
}

4
ethcore/src/miner/miner.rs
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

2
ethcore/src/types/executed.rs
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.

10
rpc/src/v1/impls/ethcore.rs
View File

@ -255,7 +255,7 @@ impl<C, M> Ethcore for EthcoreClient<C, M> where C: BlockChainClient + 'static,
from_params(params)
.and_then(|(request,)| {
let signed = try!(self.sign_call(request));
let r = take_weak!(self.client).call(&signed, CallAnalytics{ vm_tracing: true, diffing: false });
let r = take_weak!(self.client).call(&signed, CallAnalytics{ vm_tracing: true, state_diffing: false });
if let Ok(executed) = r {
if let Some(vm_trace) = executed.vm_trace {
return Ok(vm_trace_to_object(&vm_trace));
@ -265,14 +265,14 @@ impl<C, M> Ethcore for EthcoreClient<C, M> where C: BlockChainClient + 'static,
})
}
fn diff_call(&self, params: Params) -> Result<Value, Error> {
trace!(target: "jsonrpc", "diff_call: {:?}", params);
fn state_diff_call(&self, params: Params) -> Result<Value, Error> {
trace!(target: "jsonrpc", "state_diff_call: {:?}", params);
from_params(params)
.and_then(|(request,)| {
let signed = try!(self.sign_call(request));
let r = take_weak!(self.client).call(&signed, CallAnalytics{ vm_tracing: false, diffing: true });
let r = take_weak!(self.client).call(&signed, CallAnalytics{ vm_tracing: false, state_diffing: true });
if let Ok(executed) = r {
if let Some(state_diff) = executed.diff {
if let Some(state_diff) = executed.state_diff {
return Ok(state_diff_to_object(&state_diff));
}
}

8
rpc/src/v1/tests/mocked/eth.rs
View File

@ -431,7 +431,7 @@ fn rpc_eth_call() {
output: vec![0x12, 0x34, 0xff],
trace: None,
vm_trace: None,
diff: None,
state_diff: None,
});
let request = r#"{
@ -466,7 +466,7 @@ fn rpc_eth_call_default_block() {
output: vec![0x12, 0x34, 0xff],
trace: None,
vm_trace: None,
diff: None,
state_diff: None,
});
let request = r#"{
@ -500,7 +500,7 @@ fn rpc_eth_estimate_gas() {
output: vec![0x12, 0x34, 0xff],
trace: None,
vm_trace: None,
diff: None,
state_diff: None,
});
let request = r#"{
@ -535,7 +535,7 @@ fn rpc_eth_estimate_gas_default_block() {
output: vec![0x12, 0x34, 0xff],
trace: None,
vm_trace: None,
diff: None,
state_diff: None,
});
let request = r#"{

4
rpc/src/v1/traits/ethcore.rs
View File

@ -76,7 +76,7 @@ pub trait Ethcore: Sized + Send + Sync + 'static {
fn vm_trace_call(&self, _: Params) -> Result<Value, Error>;
/// Executes the given call and returns the diff for it.
fn diff_call(&self, params: Params) -> Result<Value, Error>;
fn state_diff_call(&self, params: Params) -> Result<Value, Error>;
/// Should be used to convert object to io delegate.
fn to_delegate(self) -> IoDelegate<Self> {
@ -101,7 +101,7 @@ pub trait Ethcore: Sized + Send + Sync + 'static {
delegate.add_method("ethcore_defaultExtraData", Ethcore::default_extra_data);
delegate.add_method("ethcore_vmTraceCall", Ethcore::vm_trace_call);
delegate.add_method("ethcore_diffCall", Ethcore::diff_call);
delegate.add_method("ethcore_stateDiffCall", Ethcore::state_diff_call);
delegate
}