Merge branch 'switchrpcns' into txtracingforcall

This commit is contained in:
Gav Wood
2016-06-05 21:35:58 +02:00
3 changed files with 13 additions and 8 deletions

View File

@@ -463,6 +463,7 @@ impl<V> BlockChainClient for Client<V> where V: Verifier {
}
let options = TransactOptions { tracing: analytics.transaction_tracing, 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.state_diffing {
if let Ok(ref mut x) = ret {