Big folder refactor

This commit is contained in:
Adria Massanet 2021-01-13 17:03:12 +00:00 committed by rakita
parent 0e5d6944b7
commit c46fe330dc
846 changed files with 255 additions and 39400 deletions

8
.gitmodules vendored
View File

@ -1,7 +1,3 @@
[submodule "ethcore/res/ethereum/tests"] [submodule "crates/ethcore/res/json_tests"]
path = ethcore/res/ethereum/tests path = crates/ethcore/res/json_tests
url = https://github.com/ethereum/tests.git url = https://github.com/ethereum/tests.git
branch = develop
[submodule "ethcore/res/wasm-tests"]
path = ethcore/res/wasm-tests
url = https://github.com/paritytech/wasm-tests

70
Cargo.lock generated
View File

@ -1249,47 +1249,6 @@ dependencies = [
"tiny-keccak 1.5.0", "tiny-keccak 1.5.0",
] ]
[[package]]
name = "ethcore-secretstore"
version = "1.0.0"
dependencies = [
"byteorder",
"common-types",
"env_logger",
"ethabi",
"ethabi-contract",
"ethabi-derive",
"ethcore",
"ethcore-accounts",
"ethcore-call-contract",
"ethcore-sync",
"ethereum-types 0.4.2",
"ethkey",
"futures",
"hyper 0.12.35",
"jsonrpc-server-utils",
"keccak-hash",
"kvdb",
"kvdb-rocksdb",
"lazy_static",
"log",
"parity-bytes",
"parity-crypto 0.3.1",
"parity-runtime",
"parking_lot 0.7.1",
"percent-encoding 2.1.0",
"rustc-hex 1.0.0",
"serde",
"serde_derive",
"serde_json",
"tempdir",
"tiny-keccak 1.5.0",
"tokio",
"tokio-io",
"tokio-service",
"url 2.1.0",
]
[[package]] [[package]]
name = "ethcore-service" name = "ethcore-service"
version = "0.1.0" version = "0.1.0"
@ -2885,7 +2844,6 @@ dependencies = [
"ethcore-logger", "ethcore-logger",
"ethcore-miner", "ethcore-miner",
"ethcore-network", "ethcore-network",
"ethcore-secretstore",
"ethcore-service", "ethcore-service",
"ethcore-sync", "ethcore-sync",
"ethereum-types 0.4.2", "ethereum-types 0.4.2",
@ -2920,7 +2878,6 @@ dependencies = [
"pretty_assertions", "pretty_assertions",
"prometheus", "prometheus",
"regex 1.3.9", "regex 1.3.9",
"registrar",
"rlp 0.3.0", "rlp 0.3.0",
"rpassword", "rpassword",
"rustc-hex 1.0.0", "rustc-hex 1.0.0",
@ -3604,22 +3561,6 @@ dependencies = [
"getopts", "getopts",
] ]
[[package]]
name = "pwasm-run-test"
version = "0.1.0"
dependencies = [
"clap",
"env_logger",
"ethereum-types 0.4.2",
"ethjson",
"rustc-hex 1.0.0",
"serde",
"serde_derive",
"serde_json",
"vm",
"wasm",
]
[[package]] [[package]]
name = "pwasm-utils" name = "pwasm-utils"
version = "0.6.2" version = "0.6.2"
@ -3961,17 +3902,6 @@ version = "0.6.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"
[[package]]
name = "registrar"
version = "0.0.1"
dependencies = [
"ethabi",
"ethabi-contract",
"ethabi-derive",
"futures",
"keccak-hash",
]
[[package]] [[package]]
name = "relay" name = "relay"
version = "0.1.1" version = "0.1.1"

View File

@ -10,7 +10,7 @@ authors = [
] ]
[dependencies] [dependencies]
blooms-db = { path = "util/blooms-db" } blooms-db = { path = "crates/db/blooms-db" }
log = "0.4" log = "0.4"
rustc-hex = "1.0" rustc-hex = "1.0"
docopt = "1.0" docopt = "1.0"
@ -35,44 +35,42 @@ fdlimit = "0.1"
ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" } ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
jsonrpc-core = "15.0.0" jsonrpc-core = "15.0.0"
parity-bytes = "0.1" parity-bytes = "0.1"
common-types = { path = "ethcore/types" } common-types = { path = "crates/ethcore/types" }
ethcore = { path = "ethcore", features = ["parity"] } ethcore = { path = "crates/ethcore", features = ["parity"] }
ethcore-accounts = { path = "accounts", optional = true } ethcore-accounts = { path = "crates/accounts", optional = true }
ethcore-blockchain = { path = "ethcore/blockchain" } ethcore-blockchain = { path = "crates/ethcore/blockchain" }
ethcore-call-contract = { path = "ethcore/call-contract"} ethcore-call-contract = { path = "crates/vm/call-contract"}
ethcore-db = { path = "ethcore/db" } ethcore-db = { path = "crates/db/db" }
ethcore-io = { path = "util/io" } ethcore-io = { path = "crates/runtime/io" }
ethcore-logger = { path = "parity/logger" } ethcore-logger = { path = "bin/oe/logger" }
ethcore-miner = { path = "miner" } ethcore-miner = { path = "crates/concensus/miner" }
ethcore-network = { path = "util/network" } ethcore-network = { path = "crates/net/network" }
ethcore-service = { path = "ethcore/service" } ethcore-service = { path = "crates/ethcore/service" }
ethcore-sync = { path = "ethcore/sync" } ethcore-sync = { path = "crates/ethcore/sync" }
ethereum-types = "0.4" ethereum-types = "0.4"
ethkey = { path = "accounts/ethkey" } ethkey = { path = "crates/accounts/ethkey" }
ethstore = { path = "accounts/ethstore" } ethstore = { path = "crates/accounts/ethstore" }
fetch = { path = "util/fetch" } fetch = { path = "crates/net/fetch" }
node-filter = { path = "ethcore/node-filter" } node-filter = { path = "crates/net/node-filter" }
rlp = { version = "0.3.0", features = ["ethereum"] } rlp = { version = "0.3.0", features = ["ethereum"] }
cli-signer= { path = "cli-signer" } cli-signer= { path = "crates/util/cli-signer" }
parity-daemonize = "0.3" parity-daemonize = "0.3"
parity-local-store = { path = "miner/local-store" } parity-local-store = { path = "crates/concensus/miner/local-store" }
parity-runtime = { path = "util/runtime" } parity-runtime = { path = "crates/runtime/runtime" }
parity-rpc = { path = "rpc" } parity-rpc = { path = "crates/rpc" }
parity-version = { path = "util/version" } parity-version = { path = "crates/util/version" }
parity-path = "0.1" parity-path = "0.1"
dir = { path = "util/dir" } dir = { path = "crates/util/dir" }
panic_hook = { path = "util/panic-hook" } panic_hook = { path = "crates/util/panic-hook" }
keccak-hash = "0.1" keccak-hash = "0.1"
migration-rocksdb = { path = "util/migration-rocksdb" } migration-rocksdb = { path = "crates/db/migration-rocksdb" }
kvdb = "0.1" kvdb = "0.1"
kvdb-rocksdb = "0.1.3" kvdb-rocksdb = "0.1.3"
journaldb = { path = "util/journaldb" } journaldb = { path = "crates/db/journaldb" }
stats = { path = "util/stats" } stats = { path = "crates/util/stats" }
prometheus = "0.9.0" prometheus = "0.9.0"
ethcore-secretstore = { path = "secret-store", optional = true } # ethcore-secretstore = { path = "crates/util/secret-store", optional = true }
registrar = { path = "util/registrar" }
[build-dependencies] [build-dependencies]
rustc_version = "0.2" rustc_version = "0.2"
@ -81,7 +79,7 @@ rustc_version = "0.2"
pretty_assertions = "0.1" pretty_assertions = "0.1"
ipnetwork = "0.12.6" ipnetwork = "0.12.6"
tempdir = "0.3" tempdir = "0.3"
fake-fetch = { path = "util/fake-fetch" } fake-fetch = { path = "crates/net/fake-fetch" }
lazy_static = "1.2.0" lazy_static = "1.2.0"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
@ -97,7 +95,6 @@ test-heavy = ["ethcore/test-heavy"]
evm-debug = ["ethcore/evm-debug"] evm-debug = ["ethcore/evm-debug"]
evm-debug-tests = ["ethcore/evm-debug-tests"] evm-debug-tests = ["ethcore/evm-debug-tests"]
slow-blocks = ["ethcore/slow-blocks"] slow-blocks = ["ethcore/slow-blocks"]
secretstore = ["ethcore-secretstore", "ethcore-secretstore/accounts"]
final = ["parity-version/final"] final = ["parity-version/final"]
deadlock_detection = ["parking_lot/deadlock_detection"] deadlock_detection = ["parking_lot/deadlock_detection"]
# to create a memory profile (requires nightly rust), use e.g. # to create a memory profile (requires nightly rust), use e.g.
@ -109,10 +106,10 @@ deadlock_detection = ["parking_lot/deadlock_detection"]
memory_profiling = [] memory_profiling = []
[lib] [lib]
path = "parity/lib.rs" path = "bin/oe/lib.rs"
[[bin]] [[bin]]
path = "parity/main.rs" path = "bin/oe/main.rs"
name = "openethereum" name = "openethereum"
[profile.test] [profile.test]
@ -128,16 +125,10 @@ lto = true
# in the dependency tree in any other way # in the dependency tree in any other way
# (i.e. pretty much only standalone CLI tools) # (i.e. pretty much only standalone CLI tools)
members = [ members = [
"accounts/ethkey/cli", "bin/ethkey",
"accounts/ethstore/cli", "bin/ethstore",
"chainspec", "bin/evmbin",
"ethcore/wasm/run", "bin/chainspec"
"evmbin",
"util/triehash-ethereum",
"util/keccak-hasher",
"util/patricia-trie-ethereum",
"util/fastmap",
"util/time-utils"
] ]
[patch.crates-io] [patch.crates-io]

View File

@ -5,5 +5,5 @@ version = "0.1.0"
authors = ["Marek Kotewicz <marek@parity.io>"] authors = ["Marek Kotewicz <marek@parity.io>"]
[dependencies] [dependencies]
ethjson = { path = "../json" } ethjson = { path = "../../crates/ethjson" }
serde_json = "1.0" serde_json = "1.0"

View File

@ -7,8 +7,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies] [dependencies]
docopt = "1.0" docopt = "1.0"
env_logger = "0.5" env_logger = "0.5"
ethkey = { path = "../" } ethkey = { path = "../../crates/accounts/ethkey" }
panic_hook = { path = "../../../util/panic-hook" } panic_hook = { path = "../../crates/util/panic-hook" }
parity-wordlist="1.3" parity-wordlist="1.3"
rustc-hex = "1.0" rustc-hex = "1.0"
serde = "1.0" serde = "1.0"

View File

@ -12,9 +12,9 @@ rustc-hex = "1.0"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
parking_lot = "0.7" parking_lot = "0.7"
ethstore = { path = "../" } ethstore = { path = "../../crates/accounts/ethstore" }
dir = { path = '../../../util/dir' } dir = { path = '../../crates/util/dir' }
panic_hook = { path = "../../../util/panic-hook" } panic_hook = { path = "../../crates/util/panic-hook" }
[[bin]] [[bin]]
name = "ethstore" name = "ethstore"

View File

@ -9,20 +9,20 @@ name = "openethereum-evm"
path = "./src/main.rs" path = "./src/main.rs"
[dependencies] [dependencies]
common-types = { path = "../ethcore/types", features = ["test-helpers"] } common-types = { path = "../../crates/ethcore/types", features = ["test-helpers"] }
docopt = "1.0" docopt = "1.0"
env_logger = "0.5" env_logger = "0.5"
ethcore = { path = "../ethcore", features = ["test-helpers", "json-tests", "to-pod-full"] } ethcore = { path = "../../crates/ethcore", features = ["test-helpers", "json-tests", "to-pod-full"] }
ethereum-types = "0.4" ethereum-types = "0.4"
ethjson = { path = "../json" } ethjson = { path = "../../crates/ethjson" }
evm = { path = "../ethcore/evm" } evm = { path = "../../crates/vm/evm" }
panic_hook = { path = "../util/panic-hook" } panic_hook = { path = "../../crates/util/panic-hook" }
parity-bytes = "0.1" parity-bytes = "0.1"
rustc-hex = "1.0" rustc-hex = "1.0"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
vm = { path = "../ethcore/vm" } vm = { path = "../../crates/vm/vm" }
[dev-dependencies] [dev-dependencies]
criterion = "0.3.0" criterion = "0.3.0"

View File

@ -67,7 +67,6 @@ extern crate parity_rpc;
extern crate parity_runtime; extern crate parity_runtime;
extern crate parity_version; extern crate parity_version;
extern crate prometheus; extern crate prometheus;
extern crate registrar;
extern crate stats; extern crate stats;
#[macro_use] #[macro_use]

View File

@ -11,7 +11,7 @@ eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", rev = "c
ethereum-types = "0.4" ethereum-types = "0.4"
lazy_static = "1.0" lazy_static = "1.0"
log = "0.4" log = "0.4"
memzero = { path = "../../util/memzero" } memzero = { path = "../../../crates/util/memzero" }
parity-wordlist = "1.3" parity-wordlist = "1.3"
quick-error = "1.2.2" quick-error = "1.2.2"
rand = "0.4" rand = "0.4"

Some files were not shown because too many files have changed in this diff Show More