Merge branch 'move' into travis_move

2016-01-31 12:45:17 +01:00 · 2016-01-31 12:45:17 +01:00 · e379592a1a
commit e379592a1a
parent a3fd1277a6 ce21646e55
67 changed files with 47 additions and 45 deletions
--- a/.gitmodules
+++ b/.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
--- a/Cargo.toml
+++ b/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"
--- a/bin/Cargo.toml
+++ b/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"]
--- a/ethcore/Cargo.toml
+++ b/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 = []
--- a/ethcore/res/ethereum/frontier.json
+++ b/ethcore/res/ethereum/frontier.json
--- a/ethcore/res/ethereum/frontier_like_test.json
+++ b/ethcore/res/ethereum/frontier_like_test.json
--- a/ethcore/res/ethereum/frontier_test.json
+++ b/ethcore/res/ethereum/frontier_test.json
--- a/ethcore/res/ethereum/homestead_test.json
+++ b/ethcore/res/ethereum/homestead_test.json
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
--- a/ethcore/res/ethereum/olympic.json
+++ b/ethcore/res/ethereum/olympic.json
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
--- a/ethcore/res/null_morden.json
+++ b/ethcore/res/null_morden.json
--- a/ethcore/src/account.rs
+++ b/ethcore/src/account.rs
--- a/ethcore/src/account_diff.rs
+++ b/ethcore/src/account_diff.rs
--- a/ethcore/src/action_params.rs
+++ b/ethcore/src/action_params.rs
--- a/ethcore/src/basic_types.rs
+++ b/ethcore/src/basic_types.rs
--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
--- a/ethcore/src/block_queue.rs
+++ b/ethcore/src/block_queue.rs
--- a/ethcore/src/blockchain.rs
+++ b/ethcore/src/blockchain.rs
--- a/ethcore/src/builtin.rs
+++ b/ethcore/src/builtin.rs
--- a/ethcore/src/client.rs
+++ b/ethcore/src/client.rs
--- a/ethcore/src/common.rs
+++ b/ethcore/src/common.rs
--- a/ethcore/src/engine.rs
+++ b/ethcore/src/engine.rs
--- a/ethcore/src/env_info.rs
+++ b/ethcore/src/env_info.rs
--- a/ethcore/src/error.rs
+++ b/ethcore/src/error.rs
--- a/ethcore/src/ethereum/denominations.rs
+++ b/ethcore/src/ethereum/denominations.rs
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
--- a/ethcore/src/evm/evm.rs
+++ b/ethcore/src/evm/evm.rs
--- a/ethcore/src/evm/ext.rs
+++ b/ethcore/src/evm/ext.rs
--- a/ethcore/src/evm/factory.rs
+++ b/ethcore/src/evm/factory.rs
--- a/ethcore/src/evm/instructions.rs
+++ b/ethcore/src/evm/instructions.rs
--- a/ethcore/src/evm/interpreter.rs
+++ b/ethcore/src/evm/interpreter.rs
--- a/ethcore/src/evm/jit.rs
+++ b/ethcore/src/evm/jit.rs
--- a/ethcore/src/evm/mod.rs
+++ b/ethcore/src/evm/mod.rs
--- a/ethcore/src/evm/schedule.rs
+++ b/ethcore/src/evm/schedule.rs
--- a/ethcore/src/evm/tests.rs
+++ b/ethcore/src/evm/tests.rs
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
--- a/ethcore/src/extras.rs
+++ b/ethcore/src/extras.rs
--- a/ethcore/src/header.rs
+++ b/ethcore/src/header.rs
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
--- a/ethcore/src/log_entry.rs
+++ b/ethcore/src/log_entry.rs
--- a/ethcore/src/null_engine.rs
+++ b/ethcore/src/null_engine.rs
--- a/ethcore/src/pod_account.rs
+++ b/ethcore/src/pod_account.rs
--- a/ethcore/src/pod_state.rs
+++ b/ethcore/src/pod_state.rs
--- a/ethcore/src/receipt.rs
+++ b/ethcore/src/receipt.rs
--- a/ethcore/src/service.rs
+++ b/ethcore/src/service.rs
--- a/ethcore/src/spec.rs
+++ b/ethcore/src/spec.rs
--- a/ethcore/src/state.rs
+++ b/ethcore/src/state.rs
--- a/ethcore/src/state_diff.rs
+++ b/ethcore/src/state_diff.rs
--- a/ethcore/src/substate.rs
+++ b/ethcore/src/substate.rs
--- a/ethcore/src/tests/chain.rs
+++ b/ethcore/src/tests/chain.rs
--- a/ethcore/src/tests/client.rs
+++ b/ethcore/src/tests/client.rs
--- a/ethcore/src/tests/executive.rs
+++ b/ethcore/src/tests/executive.rs
--- a/ethcore/src/tests/helpers.rs
+++ b/ethcore/src/tests/helpers.rs
--- a/ethcore/src/tests/homestead_chain.rs
+++ b/ethcore/src/tests/homestead_chain.rs
--- a/ethcore/src/tests/homestead_state.rs
+++ b/ethcore/src/tests/homestead_state.rs
--- a/ethcore/src/tests/mod.rs
+++ b/ethcore/src/tests/mod.rs
--- a/ethcore/src/tests/state.rs
+++ b/ethcore/src/tests/state.rs
--- a/ethcore/src/tests/test_common.rs
+++ b/ethcore/src/tests/test_common.rs
--- a/ethcore/src/tests/transaction.rs
+++ b/ethcore/src/tests/transaction.rs
--- a/ethcore/src/transaction.rs
+++ b/ethcore/src/transaction.rs
--- a/ethcore/src/verification.rs
+++ b/ethcore/src/verification.rs
--- a/ethcore/src/views.rs
+++ b/ethcore/src/views.rs
--- a/bin/src/main.rs
+++ b/bin/src/main.rs
--- a/util/Cargo.toml
+++ b/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" }