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

Fixed evmbin

Browse Source
This commit is contained in:
debris 2017-08-01 16:41:33 +02:00
parent af8c5bb31a
commit 7f85c0ce2a
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

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

1
evmbin/Cargo.toml
View File

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

2
evmbin/src/display/json.rs
View File

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

2
evmbin/src/display/simple.rs
View File

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

0
evmbin/src/vm.rs → evmbin/src/info.rs
View File

7
evmbin/src/main.rs
View File

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