Fixed evmbin

Cargo.lock

@@ -927,6 +927,7 @@ dependencies = [
  "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vm 0.1.0",
 ]
 
 [[package]]

evmbin/Cargo.toml

@@ -16,6 +16,7 @@ serde_derive = "1.0"
 ethcore = { path = "../ethcore" }
 ethcore-util = { path = "../util" }
 evm = { path = "../ethcore/evm" }
+vm = { path = "../ethcore/vm" }
 panic_hook = { path = "../panic_hook" }
 
 [features]

evmbin/src/display/json.rs

@@ -21,7 +21,7 @@ use std::collections::HashMap;
 use util::{U256, H256, ToPretty};
 
 use display;
-use vm;
+use info as vm;
 
 /// JSON formatting informant.
 #[derive(Default)]

evmbin/src/display/simple.rs

@@ -20,7 +20,7 @@ use ethcore::trace;
 use util::ToPretty;
 
 use display;
-use vm;
+use info as vm;
 
 /// Simple formatting informant.
 #[derive(Default)]

evmbin/src/main.rs

@@ -25,6 +25,7 @@ extern crate serde;
 extern crate serde_derive;
 extern crate docopt;
 extern crate ethcore_util as util;
+extern crate vm;
 extern crate evm;
 extern crate panic_hook;
 
@@ -36,10 +37,10 @@ use util::{U256, Bytes, Address};
 use ethcore::spec;
 use vm::ActionParams;
 
-mod vm;
+mod info;
 mod display;
 
-use vm::Informant;
+use info::Informant;
 
 const USAGE: &'static str = r#"
 EVM implementation for Parity.
@@ -90,7 +91,7 @@ fn run<T: Informant>(args: Args, mut informant: T) {
 	params.data = data;
 
 	informant.set_gas(gas);
-	let result = vm::run(&mut informant, spec, params);
+	let result = info::run(&mut informant, spec, params);
 	informant.finish(result);
 }