Merge branch 'move' into travis_move

.gitmodules

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

Cargo.toml

@@ -1,30 +1,26 @@
 [package]
-description = "Ethcore library"
-homepage = "http://ethcore.io"
+description = "Ethcore client."
+name = "parity"
+version = "0.9.0"
 license = "GPL-3.0"
-name = "ethcore"
-version = "0.1.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]
 log = "0.3"
 env_logger = "0.3"
-ethcore-util = { path = "util" }
 rustc-serialize = "0.3"
-flate2 = "0.2"
-rocksdb = "0.3"
-heapsize = "0.2.0"
-rust-crypto = "0.2.34"
-time = "0.1"
-#interpolate_idents = { git = "https://github.com/SkylerLipthay/interpolate_idents" }
-evmjit = { path = "evmjit", optional = true }
-ethash = { path = "ethash" }
-num_cpus = "0.2"
+docopt = "0.6"
+docopt_macros = "0.6"
+ctrlc = "1.0"
 clippy = "0.0.37"
-crossbeam = "0.1.5"
-lazy_static = "0.1"
+ethcore-util = { path = "util" }
+ethcore = { path = "ethcore" }
+ethsync = { path = "sync" }
+ethcore-rpc = { path = "rpc", optional = true }
 
 [features]
-jit = ["evmjit"]
-evm_debug = []
-test-heavy = []
+rpc = ["ethcore-rpc"]
+
+[[bin]]
+path = "parity/main.rs"
+name = "parity"

bin/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-description = "Ethcore client."
-name = "parity"
-version = "0.9.0"
-license = "GPL-3.0"
-authors = ["Ethcore <admin@ethcore.io>"]
-
-[dependencies]
-log = "0.3"
-env_logger = "0.3"
-rustc-serialize = "0.3"
-docopt = "0.6"
-docopt_macros = "0.6"
-ctrlc = "1.0"
-ethcore-util = { path = "../util" }
-ethcore-rpc = { path = "../rpc", optional = true }
-ethcore = { path = ".." }
-ethsync = { path = "../sync" }
-clippy = "0.0.37"
-
-[features]
-rpc = ["ethcore-rpc"]

ethcore/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+description = "Ethcore library"
+homepage = "http://ethcore.io"
+license = "GPL-3.0"
+name = "ethcore"
+version = "0.1.0"
+authors = ["Ethcore <admin@ethcore.io>"]
+
+[dependencies]
+log = "0.3"
+env_logger = "0.3"
+rustc-serialize = "0.3"
+flate2 = "0.2"
+rocksdb = "0.3"
+heapsize = "0.2.0"
+rust-crypto = "0.2.34"
+time = "0.1"
+#interpolate_idents = { git = "https://github.com/SkylerLipthay/interpolate_idents" }
+ethcore-util = { path = "../util" }
+evmjit = { path = "../evmjit", optional = true }
+ethash = { path = "../ethash" }
+num_cpus = "0.2"
+clippy = "0.0.37"
+crossbeam = "0.1.5"
+lazy_static = "0.1"
+
+[features]
+jit = ["evmjit"]
+evm_debug = []
+test-heavy = []

util/Cargo.toml

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