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

Fix mock tests.

Browse Source
This commit is contained in:
Gav Wood
2016-05-30 11:53:20 +02:00
parent af05939d74
commit 11f4e8cb73
3 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ use ethminer::MinerService;
use ethcore::client::BlockChainClient;
use ethcore::trace::VMTrace;
use ethcore::transaction::{Transaction as EthTransaction, SignedTransaction, Action};
use ethcore::get_info;
use v1::traits::Ethcore;
use v1::types::{Bytes, CallRequest};
@@ -81,8 +80,7 @@ fn vm_trace_to_object(t: &VMTrace) -> Value {
.map(|(i, op)| {
let mut m = map![
"pc".to_owned() => to_value(&op.pc).unwrap(),
"inst".to_owned() => to_value(&get_info(op.instruction).name).unwrap(),
"gas_cost".to_owned() => to_value(&op.gas_cost).unwrap(),
"cost".to_owned() => to_value(&op.gas_cost).unwrap(),
"stack".to_owned() => to_value(&op.stack).unwrap()
];
if next_sub.is_some() && next_sub.unwrap().parent_step == i {