diff --git a/Cargo.lock b/Cargo.lock index 54e37b4d4..7ad0a17ad 100644 --- a/Cargo.lock +++ b/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]] diff --git a/evmbin/Cargo.toml b/evmbin/Cargo.toml index 5e9c50f8f..698646a3c 100644 --- a/evmbin/Cargo.toml +++ b/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] diff --git a/evmbin/src/display/json.rs b/evmbin/src/display/json.rs index f12657579..f2621121e 100644 --- a/evmbin/src/display/json.rs +++ b/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)] diff --git a/evmbin/src/display/simple.rs b/evmbin/src/display/simple.rs index 9f8f7ee14..b03f97c8d 100644 --- a/evmbin/src/display/simple.rs +++ b/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)] diff --git a/evmbin/src/vm.rs b/evmbin/src/info.rs similarity index 100% rename from evmbin/src/vm.rs rename to evmbin/src/info.rs diff --git a/evmbin/src/main.rs b/evmbin/src/main.rs index eda0aee66..232642015 100644 --- a/evmbin/src/main.rs +++ b/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(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); }