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

moving around dirs

This commit is contained in:
debris 2016-01-31 11:08:04 +01:00
parent 8fe0d74b64
commit 02f5004161
13 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "res/ethereum/tests"] [submodule "ethcore/res/ethereum/tests"]
path = res/ethereum/tests path = ethcore/res/ethereum/tests
url = git@github.com:ethereum/tests url = git@github.com:ethereum/tests
branch = develop branch = develop

16
bin/Cargo.toml → Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
description = "Ethcore client." description = "Ethcore client."
name = "ethcore-client" name = "parity"
version = "0.1.0" version = "0.9.0"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Ethcore <admin@ethcore.io>"] authors = ["Ethcore <admin@ethcore.io>"]
@ -12,11 +12,15 @@ rustc-serialize = "0.3"
docopt = "0.6" docopt = "0.6"
docopt_macros = "0.6" docopt_macros = "0.6"
ctrlc = "1.0" ctrlc = "1.0"
ethcore-util = { path = "../util" }
ethcore-rpc = { path = "../rpc", optional = true }
ethcore = { path = ".." }
ethsync = { path = "../sync" }
clippy = "0.0.37" clippy = "0.0.37"
ethcore-util = { path = "util" }
ethcore = { path = "ethcore" }
ethsync = { path = "sync" }
ethcore-rpc = { path = "rpc", optional = true }
[features] [features]
rpc = ["ethcore-rpc"] rpc = ["ethcore-rpc"]
[[bin]]
path = "parity/main.rs"
name = "parity"

6
ethcore/Cargo.toml
View File

@ -9,7 +9,6 @@ authors = ["Ethcore <admin@ethcore.io>"]
[dependencies] [dependencies]
log = "0.3" log = "0.3"
env_logger = "0.3" env_logger = "0.3"
ethcore-util = { path = "util" }
rustc-serialize = "0.3" rustc-serialize = "0.3"
flate2 = "0.2" flate2 = "0.2"
rocksdb = "0.3" rocksdb = "0.3"
@ -17,8 +16,9 @@ heapsize = "0.2.0"
rust-crypto = "0.2.34" rust-crypto = "0.2.34"
time = "0.1" time = "0.1"
#interpolate_idents = { git = "https://github.com/SkylerLipthay/interpolate_idents" } #interpolate_idents = { git = "https://github.com/SkylerLipthay/interpolate_idents" }
evmjit = { path = "evmjit", optional = true } ethcore-util = { path = "../util" }
ethash = { path = "ethash" } evmjit = { path = "../evmjit", optional = true }
ethash = { path = "../ethash" }
num_cpus = "0.2" num_cpus = "0.2"
clippy = "0.0.37" clippy = "0.0.37"
crossbeam = "0.1.5" crossbeam = "0.1.5"

0
res/ethereum/frontier.json → ethcore/res/ethereum/frontier.json
View File

0
res/ethereum/frontier_like_test.json → ethcore/res/ethereum/frontier_like_test.json
View File

0
res/ethereum/frontier_test.json → ethcore/res/ethereum/frontier_test.json
View File

0
res/ethereum/homestead_test.json → ethcore/res/ethereum/homestead_test.json
View File

0
res/ethereum/morden.json → ethcore/res/ethereum/morden.json
View File

0
res/ethereum/olympic.json → ethcore/res/ethereum/olympic.json
View File

0
res/ethereum/tests → ethcore/res/ethereum/tests
View File

0
res/null_morden.json → ethcore/res/null_morden.json
View File

4
bin/src/main.rs → parity/main.rs
View File

@ -9,7 +9,7 @@ extern crate rustc_serialize;
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethcore; extern crate ethcore;
extern crate ethsync; extern crate ethsync;
extern crate log; extern crate log as rlog;
extern crate env_logger; extern crate env_logger;
extern crate ctrlc; extern crate ctrlc;
@ -17,7 +17,7 @@ extern crate ctrlc;
extern crate ethcore_rpc as rpc; extern crate ethcore_rpc as rpc;
use std::env; use std::env;
use log::{LogLevelFilter}; use rlog::{LogLevelFilter};
use env_logger::LogBuilder; use env_logger::LogBuilder;
use ctrlc::CtrlC; use ctrlc::CtrlC;
use util::*; use util::*;

2
util/Cargo.toml
View File

@ -27,6 +27,4 @@ slab = { git = "https://github.com/arkpar/slab.git" }
sha3 = { path = "sha3" } sha3 = { path = "sha3" }
serde = "0.6.7" serde = "0.6.7"
clippy = "0.0.37" clippy = "0.0.37"
[dev-dependencies]
json-tests = { path = "json-tests" } json-tests = { path = "json-tests" }