From 8fe0d74b643c6eabf3f1a79d27c63f05b70275da Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 31 Jan 2016 10:36:48 +0100 Subject: [PATCH 1/2] moved src to ethcore --- Cargo.toml => ethcore/Cargo.toml | 0 {src => ethcore/src}/account.rs | 0 {src => ethcore/src}/account_diff.rs | 0 {src => ethcore/src}/action_params.rs | 0 {src => ethcore/src}/basic_types.rs | 0 {src => ethcore/src}/block.rs | 0 {src => ethcore/src}/block_queue.rs | 0 {src => ethcore/src}/blockchain.rs | 0 {src => ethcore/src}/builtin.rs | 0 {src => ethcore/src}/client.rs | 0 {src => ethcore/src}/common.rs | 0 {src => ethcore/src}/engine.rs | 0 {src => ethcore/src}/env_info.rs | 0 {src => ethcore/src}/error.rs | 0 {src => ethcore/src}/ethereum/denominations.rs | 0 {src => ethcore/src}/ethereum/ethash.rs | 0 {src => ethcore/src}/ethereum/mod.rs | 0 {src => ethcore/src}/evm/evm.rs | 0 {src => ethcore/src}/evm/ext.rs | 0 {src => ethcore/src}/evm/factory.rs | 0 {src => ethcore/src}/evm/instructions.rs | 0 {src => ethcore/src}/evm/interpreter.rs | 0 {src => ethcore/src}/evm/jit.rs | 0 {src => ethcore/src}/evm/mod.rs | 0 {src => ethcore/src}/evm/schedule.rs | 0 {src => ethcore/src}/evm/tests.rs | 0 {src => ethcore/src}/executive.rs | 0 {src => ethcore/src}/externalities.rs | 0 {src => ethcore/src}/extras.rs | 0 {src => ethcore/src}/header.rs | 0 {src => ethcore/src}/lib.rs | 0 {src => ethcore/src}/log_entry.rs | 0 {src => ethcore/src}/null_engine.rs | 0 {src => ethcore/src}/pod_account.rs | 0 {src => ethcore/src}/pod_state.rs | 0 {src => ethcore/src}/receipt.rs | 0 {src => ethcore/src}/service.rs | 0 {src => ethcore/src}/spec.rs | 0 {src => ethcore/src}/state.rs | 0 {src => ethcore/src}/state_diff.rs | 0 {src => ethcore/src}/substate.rs | 0 {src => ethcore/src}/tests/chain.rs | 0 {src => ethcore/src}/tests/client.rs | 0 {src => ethcore/src}/tests/executive.rs | 0 {src => ethcore/src}/tests/helpers.rs | 0 {src => ethcore/src}/tests/homestead_chain.rs | 0 {src => ethcore/src}/tests/homestead_state.rs | 0 {src => ethcore/src}/tests/mod.rs | 0 {src => ethcore/src}/tests/state.rs | 0 {src => ethcore/src}/tests/test_common.rs | 0 {src => ethcore/src}/tests/transaction.rs | 0 {src => ethcore/src}/transaction.rs | 0 {src => ethcore/src}/verification.rs | 0 {src => ethcore/src}/views.rs | 0 54 files changed, 0 insertions(+), 0 deletions(-) rename Cargo.toml => ethcore/Cargo.toml (100%) rename {src => ethcore/src}/account.rs (100%) rename {src => ethcore/src}/account_diff.rs (100%) rename {src => ethcore/src}/action_params.rs (100%) rename {src => ethcore/src}/basic_types.rs (100%) rename {src => ethcore/src}/block.rs (100%) rename {src => ethcore/src}/block_queue.rs (100%) rename {src => ethcore/src}/blockchain.rs (100%) rename {src => ethcore/src}/builtin.rs (100%) rename {src => ethcore/src}/client.rs (100%) rename {src => ethcore/src}/common.rs (100%) rename {src => ethcore/src}/engine.rs (100%) rename {src => ethcore/src}/env_info.rs (100%) rename {src => ethcore/src}/error.rs (100%) rename {src => ethcore/src}/ethereum/denominations.rs (100%) rename {src => ethcore/src}/ethereum/ethash.rs (100%) rename {src => ethcore/src}/ethereum/mod.rs (100%) rename {src => ethcore/src}/evm/evm.rs (100%) rename {src => ethcore/src}/evm/ext.rs (100%) rename {src => ethcore/src}/evm/factory.rs (100%) rename {src => ethcore/src}/evm/instructions.rs (100%) rename {src => ethcore/src}/evm/interpreter.rs (100%) rename {src => ethcore/src}/evm/jit.rs (100%) rename {src => ethcore/src}/evm/mod.rs (100%) rename {src => ethcore/src}/evm/schedule.rs (100%) rename {src => ethcore/src}/evm/tests.rs (100%) rename {src => ethcore/src}/executive.rs (100%) rename {src => ethcore/src}/externalities.rs (100%) rename {src => ethcore/src}/extras.rs (100%) rename {src => ethcore/src}/header.rs (100%) rename {src => ethcore/src}/lib.rs (100%) rename {src => ethcore/src}/log_entry.rs (100%) rename {src => ethcore/src}/null_engine.rs (100%) rename {src => ethcore/src}/pod_account.rs (100%) rename {src => ethcore/src}/pod_state.rs (100%) rename {src => ethcore/src}/receipt.rs (100%) rename {src => ethcore/src}/service.rs (100%) rename {src => ethcore/src}/spec.rs (100%) rename {src => ethcore/src}/state.rs (100%) rename {src => ethcore/src}/state_diff.rs (100%) rename {src => ethcore/src}/substate.rs (100%) rename {src => ethcore/src}/tests/chain.rs (100%) rename {src => ethcore/src}/tests/client.rs (100%) rename {src => ethcore/src}/tests/executive.rs (100%) rename {src => ethcore/src}/tests/helpers.rs (100%) rename {src => ethcore/src}/tests/homestead_chain.rs (100%) rename {src => ethcore/src}/tests/homestead_state.rs (100%) rename {src => ethcore/src}/tests/mod.rs (100%) rename {src => ethcore/src}/tests/state.rs (100%) rename {src => ethcore/src}/tests/test_common.rs (100%) rename {src => ethcore/src}/tests/transaction.rs (100%) rename {src => ethcore/src}/transaction.rs (100%) rename {src => ethcore/src}/verification.rs (100%) rename {src => ethcore/src}/views.rs (100%) diff --git a/Cargo.toml b/ethcore/Cargo.toml similarity index 100% rename from Cargo.toml rename to ethcore/Cargo.toml diff --git a/src/account.rs b/ethcore/src/account.rs similarity index 100% rename from src/account.rs rename to ethcore/src/account.rs diff --git a/src/account_diff.rs b/ethcore/src/account_diff.rs similarity index 100% rename from src/account_diff.rs rename to ethcore/src/account_diff.rs diff --git a/src/action_params.rs b/ethcore/src/action_params.rs similarity index 100% rename from src/action_params.rs rename to ethcore/src/action_params.rs diff --git a/src/basic_types.rs b/ethcore/src/basic_types.rs similarity index 100% rename from src/basic_types.rs rename to ethcore/src/basic_types.rs diff --git a/src/block.rs b/ethcore/src/block.rs similarity index 100% rename from src/block.rs rename to ethcore/src/block.rs diff --git a/src/block_queue.rs b/ethcore/src/block_queue.rs similarity index 100% rename from src/block_queue.rs rename to ethcore/src/block_queue.rs diff --git a/src/blockchain.rs b/ethcore/src/blockchain.rs similarity index 100% rename from src/blockchain.rs rename to ethcore/src/blockchain.rs diff --git a/src/builtin.rs b/ethcore/src/builtin.rs similarity index 100% rename from src/builtin.rs rename to ethcore/src/builtin.rs diff --git a/src/client.rs b/ethcore/src/client.rs similarity index 100% rename from src/client.rs rename to ethcore/src/client.rs diff --git a/src/common.rs b/ethcore/src/common.rs similarity index 100% rename from src/common.rs rename to ethcore/src/common.rs diff --git a/src/engine.rs b/ethcore/src/engine.rs similarity index 100% rename from src/engine.rs rename to ethcore/src/engine.rs diff --git a/src/env_info.rs b/ethcore/src/env_info.rs similarity index 100% rename from src/env_info.rs rename to ethcore/src/env_info.rs diff --git a/src/error.rs b/ethcore/src/error.rs similarity index 100% rename from src/error.rs rename to ethcore/src/error.rs diff --git a/src/ethereum/denominations.rs b/ethcore/src/ethereum/denominations.rs similarity index 100% rename from src/ethereum/denominations.rs rename to ethcore/src/ethereum/denominations.rs diff --git a/src/ethereum/ethash.rs b/ethcore/src/ethereum/ethash.rs similarity index 100% rename from src/ethereum/ethash.rs rename to ethcore/src/ethereum/ethash.rs diff --git a/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs similarity index 100% rename from src/ethereum/mod.rs rename to ethcore/src/ethereum/mod.rs diff --git a/src/evm/evm.rs b/ethcore/src/evm/evm.rs similarity index 100% rename from src/evm/evm.rs rename to ethcore/src/evm/evm.rs diff --git a/src/evm/ext.rs b/ethcore/src/evm/ext.rs similarity index 100% rename from src/evm/ext.rs rename to ethcore/src/evm/ext.rs diff --git a/src/evm/factory.rs b/ethcore/src/evm/factory.rs similarity index 100% rename from src/evm/factory.rs rename to ethcore/src/evm/factory.rs diff --git a/src/evm/instructions.rs b/ethcore/src/evm/instructions.rs similarity index 100% rename from src/evm/instructions.rs rename to ethcore/src/evm/instructions.rs diff --git a/src/evm/interpreter.rs b/ethcore/src/evm/interpreter.rs similarity index 100% rename from src/evm/interpreter.rs rename to ethcore/src/evm/interpreter.rs diff --git a/src/evm/jit.rs b/ethcore/src/evm/jit.rs similarity index 100% rename from src/evm/jit.rs rename to ethcore/src/evm/jit.rs diff --git a/src/evm/mod.rs b/ethcore/src/evm/mod.rs similarity index 100% rename from src/evm/mod.rs rename to ethcore/src/evm/mod.rs diff --git a/src/evm/schedule.rs b/ethcore/src/evm/schedule.rs similarity index 100% rename from src/evm/schedule.rs rename to ethcore/src/evm/schedule.rs diff --git a/src/evm/tests.rs b/ethcore/src/evm/tests.rs similarity index 100% rename from src/evm/tests.rs rename to ethcore/src/evm/tests.rs diff --git a/src/executive.rs b/ethcore/src/executive.rs similarity index 100% rename from src/executive.rs rename to ethcore/src/executive.rs diff --git a/src/externalities.rs b/ethcore/src/externalities.rs similarity index 100% rename from src/externalities.rs rename to ethcore/src/externalities.rs diff --git a/src/extras.rs b/ethcore/src/extras.rs similarity index 100% rename from src/extras.rs rename to ethcore/src/extras.rs diff --git a/src/header.rs b/ethcore/src/header.rs similarity index 100% rename from src/header.rs rename to ethcore/src/header.rs diff --git a/src/lib.rs b/ethcore/src/lib.rs similarity index 100% rename from src/lib.rs rename to ethcore/src/lib.rs diff --git a/src/log_entry.rs b/ethcore/src/log_entry.rs similarity index 100% rename from src/log_entry.rs rename to ethcore/src/log_entry.rs diff --git a/src/null_engine.rs b/ethcore/src/null_engine.rs similarity index 100% rename from src/null_engine.rs rename to ethcore/src/null_engine.rs diff --git a/src/pod_account.rs b/ethcore/src/pod_account.rs similarity index 100% rename from src/pod_account.rs rename to ethcore/src/pod_account.rs diff --git a/src/pod_state.rs b/ethcore/src/pod_state.rs similarity index 100% rename from src/pod_state.rs rename to ethcore/src/pod_state.rs diff --git a/src/receipt.rs b/ethcore/src/receipt.rs similarity index 100% rename from src/receipt.rs rename to ethcore/src/receipt.rs diff --git a/src/service.rs b/ethcore/src/service.rs similarity index 100% rename from src/service.rs rename to ethcore/src/service.rs diff --git a/src/spec.rs b/ethcore/src/spec.rs similarity index 100% rename from src/spec.rs rename to ethcore/src/spec.rs diff --git a/src/state.rs b/ethcore/src/state.rs similarity index 100% rename from src/state.rs rename to ethcore/src/state.rs diff --git a/src/state_diff.rs b/ethcore/src/state_diff.rs similarity index 100% rename from src/state_diff.rs rename to ethcore/src/state_diff.rs diff --git a/src/substate.rs b/ethcore/src/substate.rs similarity index 100% rename from src/substate.rs rename to ethcore/src/substate.rs diff --git a/src/tests/chain.rs b/ethcore/src/tests/chain.rs similarity index 100% rename from src/tests/chain.rs rename to ethcore/src/tests/chain.rs diff --git a/src/tests/client.rs b/ethcore/src/tests/client.rs similarity index 100% rename from src/tests/client.rs rename to ethcore/src/tests/client.rs diff --git a/src/tests/executive.rs b/ethcore/src/tests/executive.rs similarity index 100% rename from src/tests/executive.rs rename to ethcore/src/tests/executive.rs diff --git a/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs similarity index 100% rename from src/tests/helpers.rs rename to ethcore/src/tests/helpers.rs diff --git a/src/tests/homestead_chain.rs b/ethcore/src/tests/homestead_chain.rs similarity index 100% rename from src/tests/homestead_chain.rs rename to ethcore/src/tests/homestead_chain.rs diff --git a/src/tests/homestead_state.rs b/ethcore/src/tests/homestead_state.rs similarity index 100% rename from src/tests/homestead_state.rs rename to ethcore/src/tests/homestead_state.rs diff --git a/src/tests/mod.rs b/ethcore/src/tests/mod.rs similarity index 100% rename from src/tests/mod.rs rename to ethcore/src/tests/mod.rs diff --git a/src/tests/state.rs b/ethcore/src/tests/state.rs similarity index 100% rename from src/tests/state.rs rename to ethcore/src/tests/state.rs diff --git a/src/tests/test_common.rs b/ethcore/src/tests/test_common.rs similarity index 100% rename from src/tests/test_common.rs rename to ethcore/src/tests/test_common.rs diff --git a/src/tests/transaction.rs b/ethcore/src/tests/transaction.rs similarity index 100% rename from src/tests/transaction.rs rename to ethcore/src/tests/transaction.rs diff --git a/src/transaction.rs b/ethcore/src/transaction.rs similarity index 100% rename from src/transaction.rs rename to ethcore/src/transaction.rs diff --git a/src/verification.rs b/ethcore/src/verification.rs similarity index 100% rename from src/verification.rs rename to ethcore/src/verification.rs diff --git a/src/views.rs b/ethcore/src/views.rs similarity index 100% rename from src/views.rs rename to ethcore/src/views.rs From 02f5004161725839fbf3285b2ae0e02467be1b50 Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 31 Jan 2016 11:08:04 +0100 Subject: [PATCH 2/2] moving around dirs --- .gitmodules | 4 ++-- bin/Cargo.toml => Cargo.toml | 16 ++++++++++------ ethcore/Cargo.toml | 6 +++--- {res => ethcore/res}/ethereum/frontier.json | 0 .../res}/ethereum/frontier_like_test.json | 0 {res => ethcore/res}/ethereum/frontier_test.json | 0 .../res}/ethereum/homestead_test.json | 0 {res => ethcore/res}/ethereum/morden.json | 0 {res => ethcore/res}/ethereum/olympic.json | 0 {res => ethcore/res}/ethereum/tests | 0 {res => ethcore/res}/null_morden.json | 0 {bin/src => parity}/main.rs | 4 ++-- util/Cargo.toml | 2 -- 13 files changed, 17 insertions(+), 15 deletions(-) rename bin/Cargo.toml => Cargo.toml (55%) rename {res => ethcore/res}/ethereum/frontier.json (100%) rename {res => ethcore/res}/ethereum/frontier_like_test.json (100%) rename {res => ethcore/res}/ethereum/frontier_test.json (100%) rename {res => ethcore/res}/ethereum/homestead_test.json (100%) rename {res => ethcore/res}/ethereum/morden.json (100%) rename {res => ethcore/res}/ethereum/olympic.json (100%) rename {res => ethcore/res}/ethereum/tests (100%) rename {res => ethcore/res}/null_morden.json (100%) rename {bin/src => parity}/main.rs (98%) diff --git a/.gitmodules b/.gitmodules index 4174eb2e1..d134318b4 100644 --- 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 diff --git a/bin/Cargo.toml b/Cargo.toml similarity index 55% rename from bin/Cargo.toml rename to Cargo.toml index 8fc233796..3b45bd162 100644 --- a/bin/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Ethcore client." -name = "ethcore-client" -version = "0.1.0" +name = "parity" +version = "0.9.0" license = "GPL-3.0" authors = ["Ethcore "] @@ -12,11 +12,15 @@ 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" +ethcore-util = { path = "util" } +ethcore = { path = "ethcore" } +ethsync = { path = "sync" } +ethcore-rpc = { path = "rpc", optional = true } [features] rpc = ["ethcore-rpc"] + +[[bin]] +path = "parity/main.rs" +name = "parity" diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index eef261317..ef8111272 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -9,7 +9,6 @@ authors = ["Ethcore "] [dependencies] log = "0.3" env_logger = "0.3" -ethcore-util = { path = "util" } rustc-serialize = "0.3" flate2 = "0.2" rocksdb = "0.3" @@ -17,8 +16,9 @@ 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" } +ethcore-util = { path = "../util" } +evmjit = { path = "../evmjit", optional = true } +ethash = { path = "../ethash" } num_cpus = "0.2" clippy = "0.0.37" crossbeam = "0.1.5" diff --git a/res/ethereum/frontier.json b/ethcore/res/ethereum/frontier.json similarity index 100% rename from res/ethereum/frontier.json rename to ethcore/res/ethereum/frontier.json diff --git a/res/ethereum/frontier_like_test.json b/ethcore/res/ethereum/frontier_like_test.json similarity index 100% rename from res/ethereum/frontier_like_test.json rename to ethcore/res/ethereum/frontier_like_test.json diff --git a/res/ethereum/frontier_test.json b/ethcore/res/ethereum/frontier_test.json similarity index 100% rename from res/ethereum/frontier_test.json rename to ethcore/res/ethereum/frontier_test.json diff --git a/res/ethereum/homestead_test.json b/ethcore/res/ethereum/homestead_test.json similarity index 100% rename from res/ethereum/homestead_test.json rename to ethcore/res/ethereum/homestead_test.json diff --git a/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json similarity index 100% rename from res/ethereum/morden.json rename to ethcore/res/ethereum/morden.json diff --git a/res/ethereum/olympic.json b/ethcore/res/ethereum/olympic.json similarity index 100% rename from res/ethereum/olympic.json rename to ethcore/res/ethereum/olympic.json diff --git a/res/ethereum/tests b/ethcore/res/ethereum/tests similarity index 100% rename from res/ethereum/tests rename to ethcore/res/ethereum/tests diff --git a/res/null_morden.json b/ethcore/res/null_morden.json similarity index 100% rename from res/null_morden.json rename to ethcore/res/null_morden.json diff --git a/bin/src/main.rs b/parity/main.rs similarity index 98% rename from bin/src/main.rs rename to parity/main.rs index 92f0cbf20..a9dfe004e 100644 --- a/bin/src/main.rs +++ b/parity/main.rs @@ -9,7 +9,7 @@ extern crate rustc_serialize; extern crate ethcore_util as util; extern crate ethcore; extern crate ethsync; -extern crate log; +extern crate log as rlog; extern crate env_logger; extern crate ctrlc; @@ -17,7 +17,7 @@ extern crate ctrlc; extern crate ethcore_rpc as rpc; use std::env; -use log::{LogLevelFilter}; +use rlog::{LogLevelFilter}; use env_logger::LogBuilder; use ctrlc::CtrlC; use util::*; diff --git a/util/Cargo.toml b/util/Cargo.toml index d0e2e0ab7..5f57deca3 100644 --- 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" }