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

separate trie from util and make its dependencies into libs:

Browse Source 
* bytes
* hashdb
* memorydb
* nibbleslice
* nibblevec
This commit is contained in:
Hawstein 2017-09-07 02:47:45 +08:00
parent 79659bdc76
commit ade37be25b
182 changed files with 497 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Cargo.lock generated
View File

@ -352,6 +352,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bloomable 0.1.0", "bloomable 0.1.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
"ethjson 0.1.0", "ethjson 0.1.0",
"hash 0.1.0", "hash 0.1.0",
@ -559,6 +560,7 @@ dependencies = [
"ethash 1.8.0", "ethash 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bloom-journal 0.1.0", "ethcore-bloom-journal 0.1.0",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-io 1.8.0", "ethcore-io 1.8.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
@ -575,12 +577,14 @@ dependencies = [
"hardware-wallet 1.8.0", "hardware-wallet 1.8.0",
"hash 0.1.0", "hash 0.1.0",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.0",
"hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)", "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)",
"itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.0",
"native-contracts 0.1.0", "native-contracts 0.1.0",
"num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -598,6 +602,7 @@ dependencies = [
"table 0.1.0", "table 0.1.0",
"time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"trie 0.1.0",
"triehash 0.1.0", "triehash 0.1.0",
"unexpected 0.1.0", "unexpected 0.1.0",
"using_queue 0.1.0", "using_queue 0.1.0",
@ -624,6 +629,10 @@ dependencies = [
"siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "siphasher 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "ethcore-bytes"
version = "0.1.0"
[[package]] [[package]]
name = "ethcore-devtools" name = "ethcore-devtools"
version = "1.8.0" version = "1.8.0"
@ -693,6 +702,7 @@ dependencies = [
name = "ethcore-ipc-tests" name = "ethcore-ipc-tests"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
"ethcore-ipc-codegen 1.8.0", "ethcore-ipc-codegen 1.8.0",
@ -710,6 +720,7 @@ dependencies = [
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-io 1.8.0", "ethcore-io 1.8.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
@ -724,6 +735,7 @@ dependencies = [
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.0",
"rlp 0.2.0", "rlp 0.2.0",
"rlp_derive 0.1.0", "rlp_derive 0.1.0",
"serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
@ -731,6 +743,7 @@ dependencies = [
"smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"stats 0.1.0", "stats 0.1.0",
"time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)",
"trie 0.1.0",
"triehash 0.1.0", "triehash 0.1.0",
"vm 0.1.0", "vm 0.1.0",
] ]
@ -758,6 +771,7 @@ dependencies = [
"bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-io 1.8.0", "ethcore-io 1.8.0",
"ethcore-logger 1.8.0", "ethcore-logger 1.8.0",
@ -790,6 +804,7 @@ dependencies = [
"ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
"ethcore-ipc-codegen 1.8.0", "ethcore-ipc-codegen 1.8.0",
@ -852,6 +867,7 @@ dependencies = [
"eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)", "eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bloom-journal 0.1.0", "ethcore-bloom-journal 0.1.0",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-logger 1.8.0", "ethcore-logger 1.8.0",
"hash 0.1.0", "hash 0.1.0",
@ -861,12 +877,17 @@ dependencies = [
"lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
"regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.0",
"memorydb 0.1.0",
"nibbleslice 0.1.0",
"nibblevec 0.1.0",
"rlp 0.2.0", "rlp 0.2.0",
"rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)", "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"trie 0.1.0",
"triehash 0.1.0", "triehash 0.1.0",
"vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "vergen 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -965,6 +986,7 @@ dependencies = [
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-io 1.8.0", "ethcore-io 1.8.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
@ -1017,6 +1039,7 @@ dependencies = [
"docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
"ethjson 0.1.0", "ethjson 0.1.0",
"evm 0.1.0", "evm 0.1.0",
@ -1147,6 +1170,14 @@ dependencies = [
"tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "hashdb"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3",
]
[[package]] [[package]]
name = "heapsize" name = "heapsize"
version = "0.4.1" version = "0.4.1"
@ -1545,6 +1576,19 @@ dependencies = [
"libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "memorydb"
version = "0.1.0"
dependencies = [
"bigint 4.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3",
"hash 0.1.0",
"hashdb 0.1.0",
"heapsize 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0",
]
[[package]] [[package]]
name = "mime" name = "mime"
version = "0.2.6" version = "0.2.6"
@ -1711,12 +1755,28 @@ dependencies = [
"ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "nibbleslice"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "nibblevec"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"nibbleslice 0.1.0",
]
[[package]] [[package]]
name = "node-filter" name = "node-filter"
version = "1.8.0" version = "1.8.0"
dependencies = [ dependencies = [
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-io 1.8.0", "ethcore-io 1.8.0",
"ethcore-network 1.8.0", "ethcore-network 1.8.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
@ -1929,6 +1989,7 @@ dependencies = [
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-io 1.8.0", "ethcore-io 1.8.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
@ -1992,6 +2053,7 @@ dependencies = [
"clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
"fetch 0.1.0", "fetch 0.1.0",
@ -2041,6 +2103,7 @@ version = "1.8.0"
dependencies = [ dependencies = [
"ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
"fetch 0.1.0", "fetch 0.1.0",
"futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2062,6 +2125,7 @@ dependencies = [
"cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
"jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)", "jsonrpc-http-server 7.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.7)",
"mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2102,6 +2166,7 @@ dependencies = [
"ethash 1.8.0", "ethash 1.8.0",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.8.0", "ethcore-devtools 1.8.0",
"ethcore-io 1.8.0", "ethcore-io 1.8.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
@ -2218,6 +2283,7 @@ dependencies = [
"ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.8.0", "ethcore 1.8.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-ipc 1.8.0", "ethcore-ipc 1.8.0",
"ethcore-ipc-codegen 1.8.0", "ethcore-ipc-codegen 1.8.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
@ -3238,6 +3304,25 @@ dependencies = [
"protobuf 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "trie"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-logger 1.8.0",
"hash 0.1.0",
"hashdb 0.1.0",
"log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.0",
"nibbleslice 0.1.0",
"nibblevec 0.1.0",
"rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0",
"triehash 0.1.0",
]
[[package]] [[package]]
name = "triehash" name = "triehash"
version = "0.1.0" version = "0.1.0"
@ -3372,6 +3457,7 @@ dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"common-types 0.1.0", "common-types 0.1.0",
"ethcore-bigint 0.1.3", "ethcore-bigint 0.1.3",
"ethcore-bytes 0.1.0",
"ethcore-util 1.8.0", "ethcore-util 1.8.0",
"ethjson 0.1.0", "ethjson 0.1.0",
"evmjit 1.8.0", "evmjit 1.8.0",
@ -3379,6 +3465,7 @@ dependencies = [
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.0", "rlp 0.2.0",
"trie 0.1.0",
] ]
[[package]] [[package]]

1
Cargo.toml
View File

@ -35,6 +35,7 @@ jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "pa
ethsync = { path = "sync" } ethsync = { path = "sync" }
ethcore = { path = "ethcore" } ethcore = { path = "ethcore" }
ethcore-util = { path = "util" } ethcore-util = { path = "util" }
ethcore-bytes = { path = "util/bytes" }
ethcore-bigint = { path = "util/bigint" } ethcore-bigint = { path = "util/bigint" }
ethcore-io = { path = "util/io" } ethcore-io = { path = "util/io" }
ethcore-devtools = { path = "devtools" } ethcore-devtools = { path = "devtools" }

1
dapps/Cargo.toml
View File

@ -32,6 +32,7 @@ jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branc
ethcore-util = { path = "../util" } ethcore-util = { path = "../util" }
ethcore-bigint = { path = "../util/bigint" } ethcore-bigint = { path = "../util/bigint" }
ethcore-bytes = { path = "../util/bytes" }
fetch = { path = "../util/fetch" } fetch = { path = "../util/fetch" }
node-health = { path = "./node-health" } node-health = { path = "./node-health" }
parity-hash-fetch = { path = "../hash-fetch" } parity-hash-fetch = { path = "../hash-fetch" }

2
dapps/src/apps/fetcher/mod.rs
View File

@ -261,7 +261,7 @@ impl<R: URLHint + 'static, F: Fetch> Fetcher for ContentFetcher<F, R> {
mod tests { mod tests {
use std::env; use std::env;
use std::sync::Arc; use std::sync::Arc;
use util::Bytes; use bytes::Bytes;
use fetch::{Fetch, Client}; use fetch::{Fetch, Client};
use futures::{future, Future, BoxFuture}; use futures::{future, Future, BoxFuture};
use hash_fetch::urlhint::{URLHint, URLHintResult}; use hash_fetch::urlhint::{URLHint, URLHintResult};

1
dapps/src/lib.rs
View File

@ -39,6 +39,7 @@ extern crate jsonrpc_http_server;
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint; extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate fetch; extern crate fetch;
extern crate node_health; extern crate node_health;
extern crate parity_dapps_glue as parity_dapps; extern crate parity_dapps_glue as parity_dapps;

3
dapps/src/tests/helpers/registrar.rs
View File

@ -21,7 +21,8 @@ use rustc_hex::FromHex;
use hash_fetch::urlhint::ContractClient; use hash_fetch::urlhint::ContractClient;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, Address, ToPretty}; use util::Address;
use bytes::{Bytes, ToPretty};
use parking_lot::Mutex; use parking_lot::Mutex;
const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2"; const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";

4
ethcore/Cargo.toml
View File

@ -23,6 +23,10 @@ env_logger = "0.4"
ethabi = "2.0" ethabi = "2.0"
ethash = { path = "../ethash" } ethash = { path = "../ethash" }
ethcore-bloom-journal = { path = "../util/bloom" } ethcore-bloom-journal = { path = "../util/bloom" }
ethcore-bytes = { path = "../util/bytes" }
hashdb = { path = "../util/hashdb" }
memorydb = { path = "../util/memorydb" }
trie = { path = "../util/trie" }
ethcore-devtools = { path = "../devtools" } ethcore-devtools = { path = "../devtools" }
ethcore-io = { path = "../util/io" } ethcore-io = { path = "../util/io" }
ethcore-ipc = { path = "../ipc/rpc" } ethcore-ipc = { path = "../ipc/rpc" }

3
ethcore/light/Cargo.toml
View File

@ -15,6 +15,9 @@ log = "0.3"
ethcore = { path = ".."} ethcore = { path = ".."}
ethcore-util = { path = "../../util" } ethcore-util = { path = "../../util" }
ethcore-bigint = { path = "../../util/bigint" } ethcore-bigint = { path = "../../util/bigint" }
ethcore-bytes = { path = "../../util/bytes" }
memorydb = { path = "../../util/memorydb" }
trie = { path = "../../util/trie" }
ethcore-network = { path = "../../util/network" } ethcore-network = { path = "../../util/network" }
ethcore-io = { path = "../../util/io" } ethcore-io = { path = "../../util/io" }
ethcore-ipc = { path = "../../ipc/rpc", optional = true } ethcore-ipc = { path = "../../ipc/rpc", optional = true }

5
ethcore/light/src/cht.rs
View File

@ -23,8 +23,9 @@
use ethcore::ids::BlockId; use ethcore::ids::BlockId;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, HashDB, MemoryDB}; use util::{HashDB, MemoryDB};
use util::trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder}; use bytes::Bytes;
use trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
use rlp::{RlpStream, UntrustedRlp}; use rlp::{RlpStream, UntrustedRlp};
// encode a key. // encode a key.

3
ethcore/light/src/lib.rs
View File

@ -71,11 +71,14 @@ extern crate ethcore_io as io;
extern crate ethcore_network as network; extern crate ethcore_network as network;
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint; extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethcore; extern crate ethcore;
extern crate evm; extern crate evm;
extern crate heapsize; extern crate heapsize;
extern crate futures; extern crate futures;
extern crate itertools; extern crate itertools;
extern crate memorydb;
extern crate trie;
extern crate rand; extern crate rand;
extern crate rlp; extern crate rlp;
extern crate parking_lot; extern crate parking_lot;

11
ethcore/light/src/on_demand/request.rs
View File

@ -33,9 +33,10 @@ use rlp::{RlpStream, UntrustedRlp};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use parking_lot::Mutex; use parking_lot::Mutex;
use util::{Address, Bytes, DBValue, HashDB}; use util::{Address, DBValue, HashDB};
use util::memorydb::MemoryDB; use bytes::Bytes;
use util::trie::{Trie, TrieDB, TrieError}; use memorydb::MemoryDB;
use trie::{Trie, TrieDB, TrieError};
const SUPPLIED_MATCHES: &'static str = "supplied responses always match produced requests; enforced by `check_response`; qed"; const SUPPLIED_MATCHES: &'static str = "supplied responses always match produced requests; enforced by `check_response`; qed";
@ -896,8 +897,8 @@ mod tests {
use bigint::hash::H256; use bigint::hash::H256;
use util::{MemoryDB, Address}; use util::{MemoryDB, Address};
use parking_lot::Mutex; use parking_lot::Mutex;
use util::trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut}; use trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
use util::trie::recorder::Recorder; use trie::recorder::Recorder;
use hash::keccak; use hash::keccak;
use ethcore::client::{BlockChainClient, TestBlockChainClient, EachBlockWith}; use ethcore::client::{BlockChainClient, TestBlockChainClient, EachBlockWith};

11
ethcore/light/src/types/request/mod.rs
View File

@ -789,7 +789,7 @@ pub mod header_proof {
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp}; use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
/// Potentially incomplete header proof request. /// Potentially incomplete header proof request.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)] #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@ -1120,7 +1120,7 @@ pub mod account {
use super::{Field, NoSuchOutput, OutputKind, Output}; use super::{Field, NoSuchOutput, OutputKind, Output};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
/// Potentially incomplete request for an account proof. /// Potentially incomplete request for an account proof.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)] #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@ -1220,7 +1220,7 @@ pub mod account {
pub mod storage { pub mod storage {
use super::{Field, NoSuchOutput, OutputKind, Output}; use super::{Field, NoSuchOutput, OutputKind, Output};
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
/// Potentially incomplete request for an storage proof. /// Potentially incomplete request for an storage proof.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)] #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@ -1329,7 +1329,7 @@ pub mod storage {
pub mod contract_code { pub mod contract_code {
use super::{Field, NoSuchOutput, OutputKind, Output}; use super::{Field, NoSuchOutput, OutputKind, Output};
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
/// Potentially incomplete contract code request. /// Potentially incomplete contract code request.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)] #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@ -1417,7 +1417,8 @@ pub mod execution {
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp}; use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, Address, DBValue}; use util::{Address, DBValue};
use bytes::Bytes;
/// Potentially incomplete execution proof request. /// Potentially incomplete execution proof request.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)] #[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]

1
ethcore/node_filter/Cargo.toml
View File

@ -10,6 +10,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
ethcore = { path = ".."} ethcore = { path = ".."}
ethcore-util = { path = "../../util" } ethcore-util = { path = "../../util" }
ethcore-bigint = { path = "../../util/bigint" } ethcore-bigint = { path = "../../util/bigint" }
ethcore-bytes = { path = "../../util/bytes" }
ethcore-io = { path = "../../util/io" } ethcore-io = { path = "../../util/io" }
ethcore-network = { path = "../../util/network" } ethcore-network = { path = "../../util/network" }
native-contracts = { path = "../native_contracts" } native-contracts = { path = "../native_contracts" }

4
ethcore/node_filter/src/lib.rs
View File

@ -19,6 +19,7 @@
extern crate ethcore; extern crate ethcore;
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint; extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethcore_network as network; extern crate ethcore_network as network;
extern crate native_contracts; extern crate native_contracts;
extern crate futures; extern crate futures;
@ -32,7 +33,8 @@ use native_contracts::PeerSet as Contract;
use network::{NodeId, ConnectionFilter, ConnectionDirection}; use network::{NodeId, ConnectionFilter, ConnectionDirection};
use ethcore::client::{BlockChainClient, BlockId, ChainNotify}; use ethcore::client::{BlockChainClient, BlockId, ChainNotify};
use bigint::hash::H256; use bigint::hash::H256;
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use parking_lot::Mutex; use parking_lot::Mutex;
use futures::Future; use futures::Future;

2
ethcore/res/wasm-tests

@ -1 +1 @@
Subproject commit fcac936bf68cc271a6a6ac088efb458f3a08f38a Subproject commit 5fd27564f1ab49b25bb419bfc0cc68137e1f12f2

3
ethcore/src/block.rs
View File

@ -25,7 +25,8 @@ use triehash::ordered_trie_root;
use rlp::{UntrustedRlp, RlpStream, Encodable, Decodable, DecoderError}; use rlp::{UntrustedRlp, RlpStream, Encodable, Decodable, DecoderError};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use unexpected::{Mismatch, OutOfBounds}; use unexpected::{Mismatch, OutOfBounds};
use basic_types::{LogBloom, Seal}; use basic_types::{LogBloom, Seal};

2
ethcore/src/blockchain/best_block.rs
View File

@ -16,7 +16,7 @@
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
use header::BlockNumber; use header::BlockNumber;
/// Best block info. /// Best block info.

1
ethcore/src/blockchain/blockchain.rs
View File

@ -25,6 +25,7 @@ use heapsize::HeapSizeOf;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::{H256, H2048}; use bigint::hash::{H256, H2048};
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use bytes::Bytes;
use util::*; use util::*;
use rlp::*; use rlp::*;
use header::*; use header::*;

2
ethcore/src/blockchain/generator/block.rs
View File

@ -16,7 +16,7 @@
use rlp::*; use rlp::*;
use bigint::hash::{H256, H2048}; use bigint::hash::{H256, H2048};
use util::bytes::Bytes; use bytes::Bytes;
use header::Header; use header::Header;
use transaction::SignedTransaction; use transaction::SignedTransaction;

2
ethcore/src/blockchain/generator/complete.rs
View File

@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::hash::H256; use bigint::hash::H256;
use util::bytes::Bytes; use bytes::Bytes;
use views::BlockView; use views::BlockView;
#[derive(Default, Clone)] #[derive(Default, Clone)]

2
ethcore/src/blockchain/generator/generator.rs
View File

@ -16,7 +16,7 @@
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H2048; use bigint::hash::H2048;
use util::Bytes; use bytes::Bytes;
use header::BlockNumber; use header::BlockNumber;
use transaction::SignedTransaction; use transaction::SignedTransaction;
use super::fork::Fork; use super::fork::Fork;

4
ethcore/src/builtin.rs
View File

@ -26,7 +26,7 @@ use num::{BigUint, Zero, One};
use hash::keccak; use hash::keccak;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::BytesRef; use bytes::BytesRef;
use ethkey::{Signature, recover as ec_recover}; use ethkey::{Signature, recover as ec_recover};
use ethjson; use ethjson;
@ -509,7 +509,7 @@ mod tests {
use super::{Builtin, Linear, ethereum_builtin, Pricer, Modexp, modexp as me}; use super::{Builtin, Linear, ethereum_builtin, Pricer, Modexp, modexp as me};
use ethjson; use ethjson;
use bigint::prelude::U256; use bigint::prelude::U256;
use util::BytesRef; use bytes::BytesRef;
use rustc_hex::FromHex; use rustc_hex::FromHex;
use num::{BigUint, Zero, One}; use num::{BigUint, Zero, One};

2
ethcore/src/client/chain_notify.rs
View File

@ -16,7 +16,7 @@
use ipc::IpcConfig; use ipc::IpcConfig;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
/// Represents what has to be handled by actor listening to chain events /// Represents what has to be handled by actor listening to chain events
#[ipc] #[ipc]

9
ethcore/src/client/client.rs
View File

@ -25,11 +25,10 @@ use itertools::Itertools;
// util // util
use hash::keccak; use hash::keccak;
use timer::PerfTimer; use timer::PerfTimer;
use util::UtilError; use bytes::Bytes;
use util::Bytes; use util::{journaldb, DBValue};
use util::{journaldb, DBValue, TrieFactory, Trie}; use util::{Address, UtilError};
use util::Address; use trie::{TrieSpec, TrieFactory, Trie};
use util::trie::TrieSpec;
use util::kvdb::*; use util::kvdb::*;
// other // other

2
ethcore/src/client/error.rs
View File

@ -17,7 +17,7 @@
use util::UtilError; use util::UtilError;
use std::fmt::{Display, Formatter, Error as FmtError}; use std::fmt::{Display, Formatter, Error as FmtError};
use util::trie::TrieError; use trie::TrieError;
/// Client configuration errors. /// Client configuration errors.
#[derive(Debug)] #[derive(Debug)]

8
ethcore/src/client/evm_test_client.rs
View File

@ -20,7 +20,9 @@ use std::fmt;
use std::sync::Arc; use std::sync::Arc;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{self, journaldb, trie}; use util::journaldb;
use trie;
use bytes;
use util::kvdb::{self, KeyValueDB}; use util::kvdb::{self, KeyValueDB};
use {state, state_db, client, executive, trace, transaction, db, spec, pod_state}; use {state, state_db, client, executive, trace, transaction, db, spec, pod_state};
use factory::Factories; use factory::Factories;
@ -31,7 +33,7 @@ use vm::{self, ActionParams};
#[derive(Debug)] #[derive(Debug)]
pub enum EvmTestError { pub enum EvmTestError {
/// Trie integrity error. /// Trie integrity error.
Trie(util::TrieError), Trie(trie::TrieError),
/// EVM error. /// EVM error.
Evm(vm::Error), Evm(vm::Error),
/// Initialization error. /// Initialization error.
@ -179,7 +181,7 @@ impl<'a> EvmTestClient<'a> {
let (gas_left, _) = executive.call( let (gas_left, _) = executive.call(
params, params,
&mut substate, &mut substate,
util::BytesRef::Flexible(&mut output), bytes::BytesRef::Flexible(&mut output),
&mut tracer, &mut tracer,
vm_tracer, vm_tracer,
).map_err(EvmTestError::Evm)?; ).map_err(EvmTestError::Evm)?;

1
ethcore/src/client/test_client.rs
View File

@ -27,6 +27,7 @@ use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use parking_lot::RwLock; use parking_lot::RwLock;
use util::*; use util::*;
use bytes::Bytes;
use rlp::*; use rlp::*;
use ethkey::{Generator, Random}; use ethkey::{Generator, Random};
use devtools::*; use devtools::*;

5
ethcore/src/client/traits.rs
View File

@ -36,8 +36,9 @@ use verification::queue::QueueInfo as BlockQueueInfo;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Address, Bytes}; use util::Address;
use util::hashdb::DBValue; use bytes::Bytes;
use hashdb::DBValue;
use types::ids::*; use types::ids::*;
use types::basic_account::BasicAccount; use types::basic_account::BasicAccount;

1
ethcore/src/engines/authority_round/mod.rs
View File

@ -48,6 +48,7 @@ use semantic_version::SemanticVersion;
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use unexpected::{Mismatch, OutOfBounds}; use unexpected::{Mismatch, OutOfBounds};
use util::*; use util::*;
use bytes::Bytes;
mod finality; mod finality;

2
ethcore/src/engines/mod.rs
View File

@ -59,6 +59,7 @@ use bigint::hash::H256;
use semantic_version::SemanticVersion; use semantic_version::SemanticVersion;
use util::*; use util::*;
use unexpected::{Mismatch, OutOfBounds}; use unexpected::{Mismatch, OutOfBounds};
use bytes::Bytes;
/// Default EIP-210 contrat code. /// Default EIP-210 contrat code.
/// As defined in https://github.com/ethereum/EIPs/pull/210/commits/9df24a3714af42e3bf350265bdc75b486c909d7f#diff-e02a92c2fb96c1a1bfb05e4c6e2ef5daR49 /// As defined in https://github.com/ethereum/EIPs/pull/210/commits/9df24a3714af42e3bf350265bdc75b486c909d7f#diff-e02a92c2fb96c1a1bfb05e4c6e2ef5daR49
@ -420,6 +421,7 @@ pub mod common {
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::{Bytes, BytesRef};
use super::Engine; use super::Engine;
/// Execute a call as the system address. /// Execute a call as the system address.

1
ethcore/src/engines/tendermint/message.rs
View File

@ -20,6 +20,7 @@ use std::cmp;
use hash::keccak; use hash::keccak;
use bigint::hash::{H256, H520}; use bigint::hash::{H256, H520};
use util::*; use util::*;
use bytes::Bytes;
use super::{Height, View, BlockHash, Step}; use super::{Height, View, BlockHash, Step};
use error::Error; use error::Error;
use header::Header; use header::Header;

2
ethcore/src/engines/tendermint/mod.rs
View File

@ -36,6 +36,7 @@ use parking_lot::RwLock;
use util::*; use util::*;
use unexpected::{OutOfBounds, Mismatch}; use unexpected::{OutOfBounds, Mismatch};
use client::EngineClient; use client::EngineClient;
use bytes::Bytes;
use error::{Error, BlockError}; use error::{Error, BlockError};
use header::{Header, BlockNumber}; use header::{Header, BlockNumber};
use builtin::Builtin; use builtin::Builtin;
@ -775,6 +776,7 @@ mod tests {
use std::str::FromStr; use std::str::FromStr;
use rustc_hex::FromHex; use rustc_hex::FromHex;
use util::*; use util::*;
use bytes::Bytes;
use block::*; use block::*;
use error::{Error, BlockError}; use error::{Error, BlockError};
use header::Header; use header::Header;

2
ethcore/src/engines/validator_set/contract.rs
View File

@ -21,6 +21,7 @@ use std::sync::Weak;
use bigint::hash::H256; use bigint::hash::H256;
use parking_lot::RwLock; use parking_lot::RwLock;
use util::*; use util::*;
use bytes::Bytes;
use futures::Future; use futures::Future;
use native_contracts::ValidatorReport as Provider; use native_contracts::ValidatorReport as Provider;
@ -139,6 +140,7 @@ mod tests {
use hash::keccak; use hash::keccak;
use bigint::hash::H520; use bigint::hash::H520;
use util::*; use util::*;
use bytes::ToPretty;
use rlp::encode; use rlp::encode;
use spec::Spec; use spec::Spec;
use header::Header; use header::Header;

3
ethcore/src/engines/validator_set/mod.rs
View File

@ -26,7 +26,8 @@ mod multi;
use std::sync::Weak; use std::sync::Weak;
use ids::BlockId; use ids::BlockId;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use ethjson::spec::ValidatorSet as ValidatorSpec; use ethjson::spec::ValidatorSet as ValidatorSpec;
use client::EngineClient; use client::EngineClient;
use header::{Header, BlockNumber}; use header::{Header, BlockNumber};

3
ethcore/src/engines/validator_set/multi.rs
View File

@ -21,7 +21,8 @@ use std::sync::Weak;
use engines::{Call, Engine}; use engines::{Call, Engine};
use bigint::hash::H256; use bigint::hash::H256;
use parking_lot::RwLock; use parking_lot::RwLock;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use ids::BlockId; use ids::BlockId;
use header::{BlockNumber, Header}; use header::{BlockNumber, Header};
use client::EngineClient; use client::EngineClient;

1
ethcore/src/engines/validator_set/safe_contract.rs
View File

@ -26,6 +26,7 @@ use bigint::hash::{H160, H256};
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use util::*; use util::*;
use bytes::Bytes;
use util::cache::MemoryLruCache; use util::cache::MemoryLruCache;
use unexpected::Mismatch; use unexpected::Mismatch;
use rlp::{UntrustedRlp, RlpStream}; use rlp::{UntrustedRlp, RlpStream};

3
ethcore/src/engines/validator_set/test.rs
View File

@ -21,7 +21,8 @@ use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering}; use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
use heapsize::HeapSizeOf; use heapsize::HeapSizeOf;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use engines::{Call, Engine}; use engines::{Call, Engine};
use header::{Header, BlockNumber}; use header::{Header, BlockNumber};

1
ethcore/src/engines/vote_collector.rs
View File

@ -22,6 +22,7 @@ use std::hash::Hash;
use bigint::hash::{H256, H520}; use bigint::hash::{H256, H520};
use parking_lot:: RwLock; use parking_lot:: RwLock;
use util::*; use util::*;
use bytes::Bytes;
use rlp::{Encodable, RlpStream}; use rlp::{Encodable, RlpStream};
pub trait Message: Clone + PartialEq + Eq + Hash + Encodable + Debug { pub trait Message: Clone + PartialEq + Eq + Hash + Encodable + Debug {

1
ethcore/src/error.rs
View File

@ -21,6 +21,7 @@ use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use unexpected::{Mismatch, OutOfBounds}; use unexpected::{Mismatch, OutOfBounds};
use trie::TrieError;
use io::*; use io::*;
use header::BlockNumber; use header::BlockNumber;
use basic_types::LogBloom; use basic_types::LogBloom;

4
ethcore/src/executed.rs
View File

@ -17,7 +17,9 @@
//! Transaction execution format module. //! Transaction execution format module.
use bigint::prelude::{U256, U512}; use bigint::prelude::{U256, U512};
use util::{Bytes, Address, trie}; use util::Address;
use bytes::Bytes;
use trie;
use vm; use vm;
use trace::{VMTrace, FlatTrace}; use trace::{VMTrace, FlatTrace};
use log_entry::LogEntry; use log_entry::LogEntry;

3
ethcore/src/executive.rs
View File

@ -21,6 +21,7 @@ use hash::keccak;
use bigint::prelude::{U256, U512}; use bigint::prelude::{U256, U512};
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::{Bytes, BytesRef};
use state::{Backend as StateBackend, State, Substate, CleanupMode}; use state::{Backend as StateBackend, State, Substate, CleanupMode};
use engines::Engine; use engines::Engine;
use vm::EnvInfo; use vm::EnvInfo;
@ -680,7 +681,7 @@ mod tests {
use bigint::prelude::{U256, U512}; use bigint::prelude::{U256, U512};
use bigint::hash::H256; use bigint::hash::H256;
use util::Address; use util::Address;
use util::bytes::BytesRef; use bytes::BytesRef;
use vm::{ActionParams, ActionValue, CallType, EnvInfo, CreateContractAddress}; use vm::{ActionParams, ActionValue, CallType, EnvInfo, CreateContractAddress};
use evm::{Factory, VMType}; use evm::{Factory, VMType};
use error::ExecutionError; use error::ExecutionError;

1
ethcore/src/externalities.rs
View File

@ -20,6 +20,7 @@ use std::sync::Arc;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::{Bytes, BytesRef};
use state::{Backend as StateBackend, State, Substate, CleanupMode}; use state::{Backend as StateBackend, State, Substate, CleanupMode};
use engines::Engine; use engines::Engine;
use executive::*; use executive::*;

4
ethcore/src/factory.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
use util::trie::TrieFactory; use trie::TrieFactory;
use evm::Factory as EvmFactory; use evm::Factory as EvmFactory;
use account_db::Factory as AccountFactory; use account_db::Factory as AccountFactory;
@ -27,4 +27,4 @@ pub struct Factories {
pub trie: TrieFactory, pub trie: TrieFactory,
/// factory for account databases. /// factory for account databases.
pub accountdb: AccountFactory, pub accountdb: AccountFactory,
} }

1
ethcore/src/header.rs
View File

@ -23,6 +23,7 @@ use heapsize::HeapSizeOf;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::Bytes;
use basic_types::{LogBloom, ZERO_LOGBLOOM}; use basic_types::{LogBloom, ZERO_LOGBLOOM};
use time::get_time; use time::get_time;
use rlp::*; use rlp::*;

2
ethcore/src/json_tests/executive.rs
View File

@ -30,6 +30,8 @@ use tests::helpers::*;
use ethjson; use ethjson;
use trace::{Tracer, NoopTracer}; use trace::{Tracer, NoopTracer};
use trace::{VMTracer, NoopVMTracer}; use trace::{VMTracer, NoopVMTracer};
use bytes::{Bytes, BytesRef};
use trie;
#[derive(Debug, PartialEq, Clone)] #[derive(Debug, PartialEq, Clone)]
struct CallCreate { struct CallCreate {

8
ethcore/src/json_tests/trie.rs
View File

@ -15,9 +15,9 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
use ethjson; use ethjson;
use util::trie::{TrieFactory, TrieSpec}; use trie::{TrieFactory, TrieSpec};
use bigint::hash::H256; use bigint::hash::H256;
use util::memorydb::MemoryDB; use memorydb::MemoryDB;
fn test_trie(json: &[u8], trie: TrieSpec) -> Vec<String> { fn test_trie(json: &[u8], trie: TrieSpec) -> Vec<String> {
let tests = ethjson::trie::Test::load(json).unwrap(); let tests = ethjson::trie::Test::load(json).unwrap();
@ -49,7 +49,7 @@ fn test_trie(json: &[u8], trie: TrieSpec) -> Vec<String> {
} }
mod generic { mod generic {
use util::trie::TrieSpec; use trie::TrieSpec;
fn do_json_test(json: &[u8]) -> Vec<String> { fn do_json_test(json: &[u8]) -> Vec<String> {
super::test_trie(json, TrieSpec::Generic) super::test_trie(json, TrieSpec::Generic)
@ -60,7 +60,7 @@ mod generic {
} }
mod secure { mod secure {
use util::trie::TrieSpec; use trie::TrieSpec;
fn do_json_test(json: &[u8]) -> Vec<String> { fn do_json_test(json: &[u8]) -> Vec<String> {
super::test_trie(json, TrieSpec::Secure) super::test_trie(json, TrieSpec::Secure)

4
ethcore/src/lib.rs
View File

@ -86,12 +86,14 @@ extern crate ethcore_devtools as devtools;
extern crate ethcore_io as io; extern crate ethcore_io as io;
extern crate ethcore_ipc_nano as nanoipc; extern crate ethcore_ipc_nano as nanoipc;
extern crate ethcore_bigint as bigint; extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethcore_logger; extern crate ethcore_logger;
extern crate ethcore_stratum; extern crate ethcore_stratum;
extern crate ethjson; extern crate ethjson;
extern crate ethkey; extern crate ethkey;
extern crate futures; extern crate futures;
extern crate hardware_wallet; extern crate hardware_wallet;
extern crate hashdb;
extern crate hyper; extern crate hyper;
extern crate itertools; extern crate itertools;
extern crate linked_hash_map; extern crate linked_hash_map;
@ -106,6 +108,8 @@ extern crate rayon;
extern crate rlp; extern crate rlp;
extern crate hash; extern crate hash;
extern crate heapsize; extern crate heapsize;
extern crate memorydb;
extern crate trie;
extern crate triehash; extern crate triehash;
extern crate ansi_term; extern crate ansi_term;
extern crate semantic_version; extern crate semantic_version;

3
ethcore/src/migrations/state/v7.rs
View File

@ -20,7 +20,8 @@
use std::collections::HashMap; use std::collections::HashMap;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use util::kvdb::Database; use util::kvdb::Database;
use util::migration::{Batch, Config, Error, Migration, SimpleMigration, Progress}; use util::migration::{Batch, Config, Error, Migration, SimpleMigration, Progress};
use hash::keccak; use hash::keccak;

4
ethcore/src/migrations/v10.rs
View File

@ -19,13 +19,13 @@
use std::sync::Arc; use std::sync::Arc;
use db::{COL_EXTRA, COL_HEADERS, COL_STATE}; use db::{COL_EXTRA, COL_HEADERS, COL_STATE};
use state_db::{ACCOUNT_BLOOM_SPACE, DEFAULT_ACCOUNT_PRESET, StateDB}; use state_db::{ACCOUNT_BLOOM_SPACE, DEFAULT_ACCOUNT_PRESET, StateDB};
use util::trie::TrieDB; use trie::TrieDB;
use views::HeaderView; use views::HeaderView;
use bloom_journal::Bloom; use bloom_journal::Bloom;
use util::migration::{Error, Migration, Progress, Batch, Config}; use util::migration::{Error, Migration, Progress, Batch, Config};
use util::journaldb; use util::journaldb;
use bigint::hash::H256; use bigint::hash::H256;
use util::Trie; use trie::Trie;
use util::{Database, DBTransaction}; use util::{Database, DBTransaction};
/// Account bloom upgrade routine. If bloom already present, does nothing. /// Account bloom upgrade routine. If bloom already present, does nothing.

1
ethcore/src/miner/miner.rs
View File

@ -22,6 +22,7 @@ use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use util::*; use util::*;
use bytes::Bytes;
use timer::PerfTimer; use timer::PerfTimer;
use using_queue::{UsingQueue, GetAction}; use using_queue::{UsingQueue, GetAction};
use account_provider::{AccountProvider, SignError as AccountError}; use account_provider::{AccountProvider, SignError as AccountError};

3
ethcore/src/miner/mod.rs
View File

@ -63,7 +63,8 @@ pub use self::stratum::{Stratum, Error as StratumError, Options as StratumOption
use std::collections::BTreeMap; use std::collections::BTreeMap;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use client::{MiningBlockChainClient}; use client::{MiningBlockChainClient};
use block::ClosedBlock; use block::ClosedBlock;
use header::BlockNumber; use header::BlockNumber;

2
ethcore/src/pod_account.rs
View File

@ -22,6 +22,8 @@ use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use triehash::sec_trie_root; use triehash::sec_trie_root;
use util::*; use util::*;
use bytes::Bytes;
use trie::TrieFactory;
use state::Account; use state::Account;
use ethjson; use ethjson;
use types::account_diff::*; use types::account_diff::*;

1
ethcore/src/service.rs
View File

@ -20,6 +20,7 @@ use std::sync::Arc;
use std::path::Path; use std::path::Path;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::Bytes;
use io::*; use io::*;
use spec::Spec; use spec::Spec;
use error::*; use error::*;

7
ethcore/src/snapshot/account.rs
View File

@ -23,8 +23,9 @@ use hash::{KECCAK_EMPTY, KECCAK_NULL_RLP};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, HashDB}; use util::HashDB;
use util::trie::{TrieDB, Trie}; use bytes::Bytes;
use trie::{TrieDB, Trie};
use rlp::{RlpStream, UntrustedRlp}; use rlp::{RlpStream, UntrustedRlp};
use std::collections::HashSet; use std::collections::HashSet;
@ -151,7 +152,7 @@ pub fn from_fat_rlp(
rlp: UntrustedRlp, rlp: UntrustedRlp,
mut storage_root: H256, mut storage_root: H256,
) -> Result<(BasicAccount, Option<Bytes>), Error> { ) -> Result<(BasicAccount, Option<Bytes>), Error> {
use util::{TrieDBMut, TrieMut}; use trie::{TrieDBMut, TrieMut};
// check for special case of empty account. // check for special case of empty account.
if rlp.is_empty() { if rlp.is_empty() {

5
ethcore/src/snapshot/block.rs
View File

@ -23,7 +23,7 @@ use hash::keccak;
use views::BlockView; use views::BlockView;
use rlp::{DecoderError, RlpStream, UntrustedRlp}; use rlp::{DecoderError, RlpStream, UntrustedRlp};
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
use triehash::ordered_trie_root; use triehash::ordered_trie_root;
const HEADER_FIELDS: usize = 8; const HEADER_FIELDS: usize = 8;
@ -140,7 +140,8 @@ mod tests {
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
fn encode_block(b: &Block) -> Bytes { fn encode_block(b: &Block) -> Bytes {
b.rlp_bytes(::basic_types::Seal::With) b.rlp_bytes(::basic_types::Seal::With)

3
ethcore/src/snapshot/consensus/authority.rs
View File

@ -34,7 +34,8 @@ use snapshot::{Error, ManifestData};
use itertools::{Position, Itertools}; use itertools::{Position, Itertools};
use rlp::{RlpStream, UntrustedRlp}; use rlp::{RlpStream, UntrustedRlp};
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, KeyValueDB}; use util::KeyValueDB;
use bytes::Bytes;
/// Snapshot creation and restoration for PoA chains. /// Snapshot creation and restoration for PoA chains.
/// Chunk format: /// Chunk format:

3
ethcore/src/snapshot/consensus/work.rs
View File

@ -31,7 +31,8 @@ use engines::Engine;
use snapshot::{Error, ManifestData}; use snapshot::{Error, ManifestData};
use snapshot::block::AbridgedBlock; use snapshot::block::AbridgedBlock;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, KeyValueDB}; use util::KeyValueDB;
use bytes::Bytes;
use rlp::{RlpStream, UntrustedRlp}; use rlp::{RlpStream, UntrustedRlp};
use rand::OsRng; use rand::OsRng;

2
ethcore/src/snapshot/error.rs
View File

@ -21,7 +21,7 @@ use std::fmt;
use ids::BlockId; use ids::BlockId;
use bigint::hash::H256; use bigint::hash::H256;
use util::trie::TrieError; use trie::TrieError;
use rlp::DecoderError; use rlp::DecoderError;
/// Snapshot-related errors. /// Snapshot-related errors.

2
ethcore/src/snapshot/io.rs
View File

@ -25,7 +25,7 @@ use std::io::{self, Read, Seek, SeekFrom, Write};
use std::fs::{self, File}; use std::fs::{self, File};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use util::Bytes; use bytes::Bytes;
use bigint::hash::H256; use bigint::hash::H256;
use rlp::{RlpStream, UntrustedRlp}; use rlp::{RlpStream, UntrustedRlp};

5
ethcore/src/snapshot/mod.rs
View File

@ -32,11 +32,12 @@ use ids::BlockId;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, HashDB, DBValue, snappy}; use util::{HashDB, DBValue, snappy};
use bytes::Bytes;
use parking_lot::Mutex; use parking_lot::Mutex;
use util::journaldb::{self, Algorithm, JournalDB}; use util::journaldb::{self, Algorithm, JournalDB};
use util::kvdb::KeyValueDB; use util::kvdb::KeyValueDB;
use util::trie::{TrieDB, TrieDBMut, Trie, TrieMut}; use trie::{TrieDB, TrieDBMut, Trie, TrieMut};
use rlp::{RlpStream, UntrustedRlp}; use rlp::{RlpStream, UntrustedRlp};
use bloom_journal::Bloom; use bloom_journal::Bloom;

5
ethcore/src/snapshot/service.rs
View File

@ -37,7 +37,8 @@ use io::IoChannel;
use bigint::hash::H256; use bigint::hash::H256;
use parking_lot::{Mutex, RwLock, RwLockReadGuard}; use parking_lot::{Mutex, RwLock, RwLockReadGuard};
use util::{Bytes, UtilError}; use util::UtilError;
use bytes::Bytes;
use util::journaldb::Algorithm; use util::journaldb::Algorithm;
use util::kvdb::{Database, DatabaseConfig}; use util::kvdb::{Database, DatabaseConfig};
use util::snappy; use util::snappy;
@ -161,7 +162,7 @@ impl Restoration {
// finish up restoration. // finish up restoration.
fn finalize(mut self, engine: &Engine) -> Result<(), Error> { fn finalize(mut self, engine: &Engine) -> Result<(), Error> {
use util::trie::TrieError; use trie::TrieError;
if !self.is_done() { return Ok(()) } if !self.is_done() { return Ok(()) }

2
ethcore/src/snapshot/snapshot_service_trait.rs
View File

@ -16,7 +16,7 @@
use super::{ManifestData, RestorationStatus}; use super::{ManifestData, RestorationStatus};
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
use ipc::IpcConfig; use ipc::IpcConfig;
/// The interface for a snapshot network service. /// The interface for a snapshot network service.

6
ethcore/src/snapshot/tests/helpers.rs
View File

@ -33,10 +33,10 @@ use rand::Rng;
use util::{DBValue, KeyValueDB}; use util::{DBValue, KeyValueDB};
use bigint::hash::H256; use bigint::hash::H256;
use util::hashdb::HashDB; use hashdb::HashDB;
use util::journaldb; use util::journaldb;
use util::trie::{Alphabet, StandardMap, SecTrieDBMut, TrieMut, ValueMode}; use trie::{Alphabet, StandardMap, SecTrieDBMut, TrieMut, ValueMode};
use util::trie::{TrieDB, TrieDBMut, Trie}; use trie::{TrieDB, TrieDBMut, Trie};
// the proportion of accounts we will alter each tick. // the proportion of accounts we will alter each tick.
const ACCOUNT_CHURN: f32 = 0.01; const ACCOUNT_CHURN: f32 = 0.01;

4
ethcore/src/snapshot/tests/state.rs
View File

@ -28,7 +28,7 @@ use rand::{XorShiftRng, SeedableRng};
use bigint::hash::H256; use bigint::hash::H256;
use util::journaldb::{self, Algorithm}; use util::journaldb::{self, Algorithm};
use util::kvdb::{Database, DatabaseConfig}; use util::kvdb::{Database, DatabaseConfig};
use util::memorydb::MemoryDB; use memorydb::MemoryDB;
use parking_lot::Mutex; use parking_lot::Mutex;
use devtools::RandomTempPath; use devtools::RandomTempPath;
@ -99,7 +99,7 @@ fn get_code_from_prev_chunk() {
use rlp::RlpStream; use rlp::RlpStream;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::HashDB; use hashdb::HashDB;
use account_db::{AccountDBMut, AccountDB}; use account_db::{AccountDBMut, AccountDB};

2
ethcore/src/snapshot/watcher.rs
View File

@ -23,7 +23,7 @@ use service::ClientIoMessage;
use io::IoChannel; use io::IoChannel;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
use std::sync::Arc; use std::sync::Arc;

1
ethcore/src/spec/spec.rs
View File

@ -43,6 +43,7 @@ use bigint::prelude::U256;
use bigint::hash::{H256, H2048}; use bigint::hash::{H256, H2048};
use parking_lot::RwLock; use parking_lot::RwLock;
use util::*; use util::*;
use bytes::Bytes;
/// Parameters common to ethereum-like blockchains. /// Parameters common to ethereum-like blockchains.
/// NOTE: when adding bugfix hard-fork parameters, /// NOTE: when adding bugfix hard-fork parameters,

8
ethcore/src/state/account.rs
View File

@ -23,6 +23,9 @@ use hash::{KECCAK_EMPTY, KECCAK_NULL_RLP, keccak};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::{Bytes, ToPretty};
use trie;
use trie::{SecTrieDB, Trie, TrieFactory, TrieError};
use pod_account::*; use pod_account::*;
use rlp::*; use rlp::*;
use lru_cache::LruCache; use lru_cache::LruCache;
@ -450,8 +453,8 @@ impl Account {
/// `storage_key` is the hash of the desired storage key, meaning /// `storage_key` is the hash of the desired storage key, meaning
/// this will only work correctly under a secure trie. /// this will only work correctly under a secure trie.
pub fn prove_storage(&self, db: &HashDB, storage_key: H256) -> Result<(Vec<Bytes>, H256), Box<TrieError>> { pub fn prove_storage(&self, db: &HashDB, storage_key: H256) -> Result<(Vec<Bytes>, H256), Box<TrieError>> {
use util::trie::{Trie, TrieDB}; use trie::{Trie, TrieDB};
use util::trie::recorder::Recorder; use trie::recorder::Recorder;
let mut recorder = Recorder::new(); let mut recorder = Recorder::new();
@ -475,6 +478,7 @@ impl fmt::Debug for Account {
mod tests { mod tests {
use rlp::{UntrustedRlp, RlpType, Compressible}; use rlp::{UntrustedRlp, RlpType, Compressible};
use util::*; use util::*;
use bytes::Bytes;
use super::*; use super::*;
use account_db::*; use account_db::*;

2
ethcore/src/state/backend.rs
View File

@ -28,7 +28,7 @@ use state::Account;
use bigint::hash::H256; use bigint::hash::H256;
use parking_lot::Mutex; use parking_lot::Mutex;
use util::{Address, MemoryDB}; use util::{Address, MemoryDB};
use util::hashdb::{AsHashDB, HashDB, DBValue}; use hashdb::{AsHashDB, HashDB, DBValue};
/// State backend. See module docs for more details. /// State backend. See module docs for more details.
pub trait Backend: Send { pub trait Backend: Send {

7
ethcore/src/state/mod.rs
View File

@ -45,9 +45,12 @@ use evm::{Factory as EvmFactory};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::Bytes;
use trie;
use trie::{Trie, TrieError, TrieDB};
use trie::recorder::Recorder;
use util::trie;
use util::trie::recorder::Recorder;
mod account; mod account;
mod substate; mod substate;

2
ethcore/src/state_db.rs
View File

@ -21,7 +21,7 @@ use util::cache::MemoryLruCache;
use util::journaldb::JournalDB; use util::journaldb::JournalDB;
use util::kvdb::KeyValueDB; use util::kvdb::KeyValueDB;
use bigint::hash::H256; use bigint::hash::H256;
use util::hashdb::HashDB; use hashdb::HashDB;
use state::{self, Account}; use state::{self, Account};
use header::BlockNumber; use header::BlockNumber;
use hash::keccak; use hash::keccak;

1
ethcore/src/tests/evm.rs
View File

@ -14,6 +14,7 @@ use rustc_hex::FromHex;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::BytesRef;
evm_test!{test_blockhash_eip210: test_blockhash_eip210_jit, test_blockhash_eip210_int} evm_test!{test_blockhash_eip210: test_blockhash_eip210_jit, test_blockhash_eip210_int}
fn test_blockhash_eip210(factory: Factory) { fn test_blockhash_eip210(factory: Factory) {

1
ethcore/src/tests/helpers.rs
View File

@ -23,6 +23,7 @@ use client::{BlockChainClient, Client, ClientConfig};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::Bytes;
use spec::*; use spec::*;
use account_provider::AccountProvider; use account_provider::AccountProvider;
use state_db::StateDB; use state_db::StateDB;

3
ethcore/src/trace/executive_tracer.rs
View File

@ -17,7 +17,8 @@
//! Simple executive tracer. //! Simple executive tracer.
use bigint::prelude::U256; use bigint::prelude::U256;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use vm::ActionParams; use vm::ActionParams;
use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide, Reward, RewardType}; use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide, Reward, RewardType};
use trace::{Tracer, VMTracer, FlatTrace, TraceError}; use trace::{Tracer, VMTracer, FlatTrace, TraceError};

3
ethcore/src/trace/mod.rs
View File

@ -39,7 +39,8 @@ pub use self::types::filter::{Filter, AddressesFilter};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Bytes, Address, DBTransaction}; use util::{Address, DBTransaction};
use bytes::Bytes;
use self::trace::{Call, Create}; use self::trace::{Call, Create};
use vm::ActionParams; use vm::ActionParams;
use header::BlockNumber; use header::BlockNumber;

3
ethcore/src/trace/noop_tracer.rs
View File

@ -17,7 +17,8 @@
//! Nonoperative tracer. //! Nonoperative tracer.
use bigint::prelude::U256; use bigint::prelude::U256;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use vm::ActionParams; use vm::ActionParams;
use trace::{Tracer, VMTracer, FlatTrace, TraceError}; use trace::{Tracer, VMTracer, FlatTrace, TraceError};
use trace::trace::{Call, Create, VMTrace, RewardType}; use trace::trace::{Call, Create, VMTrace, RewardType};

3
ethcore/src/trace/types/trace.rs
View File

@ -17,7 +17,8 @@
//! Tracing datatypes. //! Tracing datatypes.
use bigint::prelude::U256; use bigint::prelude::U256;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use hash::keccak; use hash::keccak;
use bloomable::Bloomable; use bloomable::Bloomable;
use rlp::*; use rlp::*;

3
ethcore/src/transaction.rs
View File

@ -22,7 +22,8 @@ use hash::keccak;
use heapsize::HeapSizeOf; use heapsize::HeapSizeOf;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use ethkey::{Signature, Secret, Public, recover, public_to_address, Error as EthkeyError}; use ethkey::{Signature, Secret, Public, recover, public_to_address, Error as EthkeyError};
use error::*; use error::*;
use evm::Schedule; use evm::Schedule;

3
ethcore/src/tx_filter.rs
View File

@ -22,7 +22,8 @@ use std::collections::hash_map::Entry;
use bigint::hash::H256; use bigint::hash::H256;
use native_contracts::TransactAcl as Contract; use native_contracts::TransactAcl as Contract;
use client::{EngineClient, BlockId, ChainNotify}; use client::{EngineClient, BlockId, ChainNotify};
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use parking_lot::{Mutex, RwLock}; use parking_lot::{Mutex, RwLock};
use futures::{self, Future}; use futures::{self, Future};
use spec::CommonParams; use spec::CommonParams;

2
ethcore/src/verification/queue/kind.rs
View File

@ -77,7 +77,7 @@ pub mod blocks {
use heapsize::HeapSizeOf; use heapsize::HeapSizeOf;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
/// A mode for verifying blocks. /// A mode for verifying blocks.
pub struct Blocks; pub struct Blocks;

4
ethcore/src/verification/verification.rs
View File

@ -26,8 +26,8 @@ use hash::keccak;
use triehash::ordered_trie_root; use triehash::ordered_trie_root;
use heapsize::HeapSizeOf; use heapsize::HeapSizeOf;
use bigint::hash::H256; use bigint::hash::H256;
use util::*;
use unexpected::{Mismatch, OutOfBounds}; use unexpected::{Mismatch, OutOfBounds};
use bytes::Bytes;
use engines::Engine; use engines::Engine;
use error::{BlockError, Error}; use error::{BlockError, Error};
use blockchain::*; use blockchain::*;
@ -276,7 +276,7 @@ mod tests {
use bigint::hash::{H256, H2048}; use bigint::hash::{H256, H2048};
use triehash::ordered_trie_root; use triehash::ordered_trie_root;
use unexpected::{Mismatch, OutOfBounds}; use unexpected::{Mismatch, OutOfBounds};
use util::*; use bytes::Bytes;
use ethkey::{Random, Generator}; use ethkey::{Random, Generator};
use header::*; use header::*;
use verification::*; use verification::*;

2
ethcore/src/views/block.rs
View File

@ -18,7 +18,7 @@
use hash::keccak; use hash::keccak;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use bytes::Bytes;
use header::*; use header::*;
use transaction::*; use transaction::*;
use super::{TransactionView, HeaderView}; use super::{TransactionView, HeaderView};

2
ethcore/src/views/body.rs
View File

@ -18,7 +18,7 @@
use hash::keccak; use hash::keccak;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use bytes::Bytes;
use header::*; use header::*;
use transaction::*; use transaction::*;
use super::{TransactionView, HeaderView}; use super::{TransactionView, HeaderView};

3
ethcore/src/views/header.rs
View File

@ -19,7 +19,8 @@
use hash::keccak; use hash::keccak;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::{H256, H2048}; use bigint::hash::{H256, H2048};
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use rlp::Rlp; use rlp::Rlp;
use header::BlockNumber; use header::BlockNumber;

2
ethcore/src/views/transaction.rs
View File

@ -17,7 +17,7 @@
//! View onto transaction rlp //! View onto transaction rlp
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
use hash::keccak; use hash::keccak;
use rlp::Rlp; use rlp::Rlp;

1
ethcore/types/Cargo.toml
View File

@ -7,6 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies] [dependencies]
rlp = { path = "../../util/rlp" } rlp = { path = "../../util/rlp" }
rlp_derive = { path = "../../util/rlp_derive" } rlp_derive = { path = "../../util/rlp_derive" }
ethcore-bytes = { path = "../../util/bytes" }
ethcore-util = { path = "../../util" } ethcore-util = { path = "../../util" }
ethcore-bigint = { path = "../../util/bigint" } ethcore-bigint = { path = "../../util/bigint" }
ethjson = { path = "../../json" } ethjson = { path = "../../json" }

4
ethcore/types/src/account_diff.rs
View File

@ -21,7 +21,7 @@ use std::fmt;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::Bytes; use bytes::Bytes;
#[derive(Debug, PartialEq, Eq, Clone)] #[derive(Debug, PartialEq, Eq, Clone)]
/// Diff type for specifying a change (or not). /// Diff type for specifying a change (or not).
@ -114,7 +114,7 @@ fn interpreted_hash(u: &H256) -> String {
impl fmt::Display for AccountDiff { impl fmt::Display for AccountDiff {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
use util::bytes::ToPretty; use bytes::ToPretty;
match self.nonce { match self.nonce {
Diff::Born(ref x) => write!(f, " non {}", x)?, Diff::Born(ref x) => write!(f, " non {}", x)?,

1
ethcore/types/src/lib.rs
View File

@ -18,6 +18,7 @@
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint; extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethjson; extern crate ethjson;
extern crate rlp; extern crate rlp;
#[macro_use] #[macro_use]

3
ethcore/types/src/log_entry.rs
View File

@ -19,7 +19,8 @@
use std::ops::Deref; use std::ops::Deref;
use hash::keccak; use hash::keccak;
use heapsize::HeapSizeOf; use heapsize::HeapSizeOf;
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use bigint::hash::H256; use bigint::hash::H256;
use bloomable::Bloomable; use bloomable::Bloomable;

2
ethcore/types/src/snapshot_manifest.rs
View File

@ -18,7 +18,7 @@
use bigint::hash::H256; use bigint::hash::H256;
use rlp::*; use rlp::*;
use util::Bytes; use bytes::Bytes;
/// Manifest data. /// Manifest data.
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]

2
ethcore/vm/Cargo.toml
View File

@ -6,7 +6,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies] [dependencies]
byteorder = "1.0" byteorder = "1.0"
ethcore-util = { path = "../../util" } ethcore-util = { path = "../../util" }
ethcore-bytes = { path = "../../util/bytes" }
ethcore-bigint = { path = "../../util/bigint" } ethcore-bigint = { path = "../../util/bigint" }
trie = { path = "../../util/trie" }
log = "0.3" log = "0.3"
common-types = { path = "../types" } common-types = { path = "../types" }
evmjit = { path = "../../evmjit", optional = true } evmjit = { path = "../../evmjit", optional = true }

3
ethcore/vm/src/action_params.rs
View File

@ -17,7 +17,8 @@
//! Evm input params. //! Evm input params.
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::{H256}; use bigint::hash::{H256};
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use hash::{keccak, KECCAK_EMPTY}; use hash::{keccak, KECCAK_EMPTY};
use ethjson; use ethjson;

2
ethcore/vm/src/error.rs
View File

@ -16,7 +16,7 @@
//! VM errors module //! VM errors module
use util::trie; use trie;
use std::fmt; use std::fmt;
/// VM errors. /// VM errors.

1
ethcore/vm/src/ext.rs
View File

@ -20,6 +20,7 @@ use std::sync::Arc;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::*; use util::*;
use bytes::Bytes;
use call_type::CallType; use call_type::CallType;
use env_info::EnvInfo; use env_info::EnvInfo;
use schedule::Schedule; use schedule::Schedule;

2
ethcore/vm/src/lib.rs
View File

@ -18,10 +18,12 @@
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint; extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate common_types as types; extern crate common_types as types;
extern crate ethjson; extern crate ethjson;
extern crate rlp; extern crate rlp;
extern crate hash; extern crate hash;
extern crate trie;
mod action_params; mod action_params;
mod call_type; mod call_type;

3
ethcore/vm/src/tests.rs
View File

@ -19,7 +19,8 @@ use std::collections::{HashMap, HashSet};
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::{Address, Bytes}; use util::Address;
use bytes::Bytes;
use { use {
CallType, Schedule, EnvInfo, CallType, Schedule, EnvInfo,
ReturnData, Ext, ContractCreateResult, MessageCallResult, ReturnData, Ext, ContractCreateResult, MessageCallResult,

1
evmbin/Cargo.toml
View File

@ -17,6 +17,7 @@ ethcore = { path = "../ethcore" }
ethjson = { path = "../json" } ethjson = { path = "../json" }
ethcore-util = { path = "../util" } ethcore-util = { path = "../util" }
ethcore-bigint = { path = "../util/bigint" } ethcore-bigint = { path = "../util/bigint" }
ethcore-bytes = { path = "../util/bytes" }
evm = { path = "../ethcore/evm" } evm = { path = "../ethcore/evm" }
vm = { path = "../ethcore/vm" } vm = { path = "../ethcore/vm" }
panic_hook = { path = "../panic_hook" } panic_hook = { path = "../panic_hook" }

2
evmbin/src/display/json.rs
View File

@ -20,7 +20,7 @@ use ethcore::trace;
use std::collections::HashMap; use std::collections::HashMap;
use bigint::prelude::U256; use bigint::prelude::U256;
use bigint::hash::H256; use bigint::hash::H256;
use util::ToPretty; use bytes::ToPretty;
use display; use display;
use info as vm; use info as vm;

2
evmbin/src/display/simple.rs
View File

@ -17,7 +17,7 @@
//! Simple VM output. //! Simple VM output.
use ethcore::trace; use ethcore::trace;
use util::ToPretty; use bytes::ToPretty;
use display; use display;
use info as vm; use info as vm;

4
evmbin/src/main.rs
View File

@ -27,6 +27,7 @@ extern crate serde_derive;
extern crate docopt; extern crate docopt;
extern crate ethcore_util as util; extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint; extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate vm; extern crate vm;
extern crate evm; extern crate evm;
extern crate panic_hook; extern crate panic_hook;
@ -37,7 +38,8 @@ use std::path::PathBuf;
use docopt::Docopt; use docopt::Docopt;
use rustc_hex::FromHex; use rustc_hex::FromHex;
use bigint::prelude::U256; use bigint::prelude::U256;
use util::{Bytes, Address}; use util::Address;
use bytes::Bytes;
use ethcore::spec; use ethcore::spec;
use vm::{ActionParams, CallType}; use vm::{ActionParams, CallType};

1
hash-fetch/Cargo.toml
View File

@ -18,6 +18,7 @@ parking_lot = "0.4"
fetch = { path = "../util/fetch" } fetch = { path = "../util/fetch" }
ethcore-util = { path = "../util" } ethcore-util = { path = "../util" }
ethcore-bigint = { path = "../util/bigint" } ethcore-bigint = { path = "../util/bigint" }
ethcore-bytes = { path = "../util/bytes" }
parity-reactor = { path = "../util/reactor" } parity-reactor = { path = "../util/reactor" }
native-contracts = { path = "../ethcore/native_contracts" } native-contracts = { path = "../ethcore/native_contracts" }
hash = { path = "../util/hash" } hash = { path = "../util/hash" }

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