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

dissolve util (#7460)

Browse Source 
* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor in progress

* ethereum-types refactor finished

* removed obsolete util/src/lib.rs

* removed commented out code
This commit is contained in:
Marek Kotewicz 2018-01-10 13:35:18 +01:00 committed by Svyatoslav Nikolsky
parent 4a4d64be56
commit e95b093483
395 changed files with 744 additions and 1913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
Cargo.lock generated
View File

@ -112,8 +112,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.1 (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.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -167,7 +165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "bloomable"
version = "0.1.0"
dependencies = [
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
]
@ -261,9 +259,8 @@ name = "common-types"
version = "0.1.0"
dependencies = [
"bloomable 0.1.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
@ -367,7 +364,7 @@ name = "dir"
version = "0.1.0"
dependencies = [
"app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"journaldb 0.1.0",
]
@ -473,14 +470,13 @@ dependencies = [
"common-types 0.1.0",
"crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
"ethash 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bloom-journal 0.1.0",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.9.0",
"ethcore-io 1.9.0",
"ethcore-logger 1.9.0",
"ethcore-stratum 1.9.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0",
"ethkey 0.3.0",
"ethstore 0.2.0",
@ -531,31 +527,6 @@ dependencies = [
"wasm 0.1.0",
]
[[package]]
name = "ethcore-bigint"
version = "0.2.1"
dependencies = [
"bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
"plain_hasher 0.1.0",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "ethcore-bigint"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
"plain_hasher 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "ethcore-bloom-journal"
version = "0.1.0"
@ -591,13 +562,13 @@ version = "1.9.0"
dependencies = [
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-io 1.9.0",
"ethcore-network 1.9.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"evm 0.1.0",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.1",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
@ -609,6 +580,7 @@ dependencies = [
"memorydb 0.1.1",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"patricia-trie 0.1.0",
"plain_hasher 0.1.0",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.1",
"rlp_derive 0.1.0",
@ -644,12 +616,12 @@ dependencies = [
"ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.9.0",
"ethcore-io 1.9.0",
"ethcore-logger 1.9.0",
"ethcrypto 0.1.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"igd 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -677,11 +649,10 @@ version = "1.0.0"
dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-logger 1.9.0",
"ethcore-util 1.9.0",
"ethcrypto 0.1.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"ethsync 1.9.0",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@ -712,8 +683,8 @@ name = "ethcore-stratum"
version = "1.9.0"
dependencies = [
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-logger 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)",
"jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)",
"jsonrpc-tcp-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)",
@ -724,37 +695,34 @@ dependencies = [
"tokio-io 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "ethcore-util"
version = "1.9.0"
dependencies = [
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"hashdb 0.1.1",
"keccak-hash 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.1",
"patricia-trie 0.1.0",
"triehash 0.1.0",
]
[[package]]
name = "ethcrypto"
version = "0.1.0"
dependencies = [
"eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
"subtle 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)",
]
[[package]]
name = "ethereum-types"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"fixed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"uint 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "ethjson"
version = "0.1.0"
dependencies = [
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
@ -768,7 +736,7 @@ dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"edit-distance 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (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)",
"parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -798,8 +766,8 @@ name = "ethstore"
version = "0.2.0"
dependencies = [
"dir 0.1.0",
"ethcore-bigint 0.2.1",
"ethcrypto 0.1.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
@ -839,12 +807,11 @@ version = "1.9.0"
dependencies = [
"env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-io 1.9.0",
"ethcore-light 1.9.0",
"ethcore-network 1.9.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)",
@ -854,6 +821,7 @@ dependencies = [
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"macros 0.1.0",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"plain_hasher 0.1.0",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rlp 0.2.1",
"semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -867,8 +835,7 @@ name = "evm"
version = "0.1.0"
dependencies = [
"bit-set 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"evmjit 1.9.0",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
@ -886,9 +853,8 @@ version = "0.1.0"
dependencies = [
"docopt 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0",
"evm 0.1.0",
"panic_hook 0.1.0",
@ -925,6 +891,17 @@ dependencies = [
"reqwest 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "fixed-hash"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "flate2"
version = "0.2.20"
@ -1015,7 +992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "hardware-wallet"
version = "1.9.0"
dependencies = [
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"hidapi 0.3.1 (git+https://github.com/paritytech/hidapi-rs)",
"libusb 0.3.0 (git+https://github.com/paritytech/libusb-rs)",
@ -1031,7 +1008,7 @@ name = "hashdb"
version = "0.1.1"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -1215,9 +1192,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "journaldb"
version = "0.1.0"
dependencies = [
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-logger 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.1",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
@ -1226,6 +1203,7 @@ dependencies = [
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"memorydb 0.1.1",
"parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"plain_hasher 0.1.0",
"rlp 0.2.1",
"util-error 0.1.0",
]
@ -1331,7 +1309,7 @@ name = "keccak-hash"
version = "0.1.0"
dependencies = [
"cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -1368,7 +1346,7 @@ name = "kvdb-rocksdb"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"interleaved-ordered 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1525,10 +1503,11 @@ version = "0.1.1"
dependencies = [
"bigint 4.2.0 (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.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.1",
"heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
"plain_hasher 0.1.0",
"rlp 0.2.1",
]
@ -1671,7 +1650,7 @@ version = "0.1.0"
dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"native-contract-generator 0.1.0",
]
@ -1705,11 +1684,10 @@ name = "node-filter"
version = "1.9.0"
dependencies = [
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-io 1.9.0",
"ethcore-network 1.9.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb-memorydb 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1914,7 +1892,6 @@ dependencies = [
"docopt 0.8.1 (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.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.9.0",
"ethcore-io 1.9.0",
@ -1923,7 +1900,7 @@ dependencies = [
"ethcore-network 1.9.0",
"ethcore-secretstore 1.0.0",
"ethcore-stratum 1.9.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"ethsync 1.9.0",
"fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1978,10 +1955,9 @@ version = "1.9.0"
dependencies = [
"base32 0.3.1 (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.2.1",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.9.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fetch 0.1.0",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2041,9 +2017,8 @@ name = "parity-hash-fetch"
version = "1.9.0"
dependencies = [
"ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"fetch 0.1.0",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
@ -2063,8 +2038,8 @@ version = "1.9.0"
dependencies = [
"cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)",
"jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)",
"multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2092,8 +2067,7 @@ dependencies = [
name = "parity-machine"
version = "0.1.0"
dependencies = [
"ethcore-bigint 0.2.1",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2112,15 +2086,14 @@ dependencies = [
"cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethash 1.9.0",
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-devtools 1.9.0",
"ethcore-io 1.9.0",
"ethcore-light 1.9.0",
"ethcore-logger 1.9.0",
"ethcore-network 1.9.0",
"ethcore-util 1.9.0",
"ethcrypto 0.1.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0",
"ethkey 0.3.0",
"ethstore 0.2.0",
@ -2245,9 +2218,8 @@ version = "1.9.0"
dependencies = [
"ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.9.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethsync 1.9.0",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2287,9 +2259,9 @@ version = "0.1.0"
dependencies = [
"bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-network 1.9.0",
"ethcrypto 0.1.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethkey 0.3.0",
"hex 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.9)",
@ -2350,9 +2322,9 @@ name = "patricia-trie"
version = "0.1.0"
dependencies = [
"elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-logger 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"hashdb 0.1.1",
"keccak-hash 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2412,14 +2384,7 @@ name = "plain_hasher"
version = "0.1.0"
dependencies = [
"crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "plain_hasher"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@ -2506,8 +2471,8 @@ name = "pwasm-run-test"
version = "0.1.0"
dependencies = [
"clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-logger 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2654,7 +2619,7 @@ version = "0.2.1"
dependencies = [
"byteorder 1.1.0 (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.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2716,7 +2681,6 @@ name = "rpc-cli"
version = "1.4.0"
dependencies = [
"bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-util 1.9.0",
"futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-rpc 1.9.0",
"parity-rpc-client 1.4.0",
@ -3268,7 +3232,7 @@ name = "transaction-pool"
version = "1.9.0"
dependencies = [
"error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"smallvec 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -3293,7 +3257,7 @@ dependencies = [
name = "triehash"
version = "0.1.0"
dependencies = [
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"keccak-hash 0.1.0",
"rlp 0.2.1",
]
@ -3303,6 +3267,17 @@ name = "typeable"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "uint"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.4.1 (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.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "unexpected"
version = "0.1.0"
@ -3396,7 +3371,7 @@ name = "util-error"
version = "0.1.0"
dependencies = [
"error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"kvdb 0.1.0",
"rlp 0.2.1",
"rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3441,9 +3416,8 @@ version = "0.1.0"
dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"common-types 0.1.0",
"ethcore-bigint 0.2.1",
"ethcore-bytes 0.1.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"ethjson 0.1.0",
"keccak-hash 0.1.0",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -3461,9 +3435,8 @@ name = "wasm"
version = "0.1.0"
dependencies = [
"byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore-bigint 0.2.1",
"ethcore-logger 1.9.0",
"ethcore-util 1.9.0",
"ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-wasm 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",
"vm 0.1.0",
@ -3603,8 +3576,9 @@ dependencies = [
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
"checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
"checksum ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c819a3adef0413a2519cbd9a19a35dd1c20c7a0110705beaba8aa4aa87eda95f"
"checksum ethcore-bigint 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcb5af77e74a8f70e9c3337e069c37bc82178ef1b459c02091f73c4ad5281eb5"
"checksum ethereum-types 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e3e9292c4a0b6e4825315b17c73dffd0e91847b25c1e35c7b658fee50f936182"
"checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa"
"checksum fixed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "75f91321a3926b773df3c6e7e953e3c756d9c06f0e9f05d34a0e103b03fcc9a1"
"checksum flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e6234dd4468ae5d1e2dbb06fe2b058696fdc50a339c68a393aefbf00bc81e423"
"checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344"
"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
@ -3707,7 +3681,6 @@ dependencies = [
"checksum phf_generator 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6b07ffcc532ccc85e3afc45865469bf5d9e4ef5bfcf9622e3cfe80c2d275ec03"
"checksum phf_shared 0.7.21 (registry+https://github.com/rust-lang/crates.io-index)" = "07e24b0ca9643bdecd0632f2b3da6b1b89bbb0030e0b992afc1113b23a7bc2f2"
"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
"checksum plain_hasher 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83ae80873992f511142c07d0ec6c44de5636628fdb7e204abd655932ea79d995"
"checksum podio 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e5422a1ee1bc57cc47ae717b0137314258138f38fd5f3cea083f43a9725383a0"
"checksum pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2412f3332a07c7a2a50168988dcc184f32180a9758ad470390e5f55e089f6b6e"
"checksum primal 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0e31b86efadeaeb1235452171a66689682783149a6249ff334a2c5d8218d00a4"
@ -3802,6 +3775,7 @@ dependencies = [
"checksum transient-hashmap 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "715254c8f0811be1a79ad3ea5e6fa3c8eddec2b03d7f5ba78cf093e56d79c24f"
"checksum trezor-sys 1.0.0 (git+https://github.com/paritytech/trezor-sys)" = "<none>"
"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
"checksum uint 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "91ed1e25ded4e37e0967b1f12d5f910b32f979768d4f48e2f6ca7b6e7130b44e"
"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33"
"checksum unicase 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2e01da42520092d0cd2d6ac3ae69eb21a22ad43ff195676b86f8c37f487d6b80"
"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"

3
Cargo.toml
View File

@ -34,15 +34,14 @@ ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
ethsync = { path = "sync" }
ethcore = { path = "ethcore" }
ethcore-util = { path = "util" }
ethcore-bytes = { path = "util/bytes" }
ethcore-bigint = { path = "util/bigint" }
ethcore-io = { path = "util/io" }
ethcore-devtools = { path = "devtools" }
ethcore-light = { path = "ethcore/light" }
ethcore-logger = { path = "logger" }
ethcore-stratum = { path = "stratum" }
ethcore-network = { path = "util/network" }
ethereum-types = "0.1"
node-filter = { path = "ethcore/node_filter" }
ethkey = { path = "ethkey" }
node-health = { path = "dapps/node-health" }

3
dapps/Cargo.toml
View File

@ -28,9 +28,8 @@ itertools = "0.5"
jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.9" }
ethcore-util = { path = "../util" }
ethcore-bigint = { path = "../util/bigint" }
ethcore-bytes = { path = "../util/bytes" }
ethereum-types = "0.1"
fetch = { path = "../util/fetch" }
node-health = { path = "./node-health" }
parity-hash-fetch = { path = "../hash-fetch" }

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

@ -18,7 +18,7 @@ use zip;
use std::{fs, fmt};
use std::io::{self, Read, Write};
use std::path::PathBuf;
use bigint::hash::H256;
use ethereum_types::H256;
use fetch::{self, Mime};
use futures_cpupool::CpuPool;
use hash::keccak_buffer;

3
dapps/src/lib.rs
View File

@ -32,9 +32,8 @@ extern crate zip;
extern crate jsonrpc_http_server;
extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethereum_types;
extern crate fetch;
extern crate node_health;
extern crate parity_dapps_glue as parity_dapps;

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

@ -18,12 +18,11 @@ use std::str;
use std::sync::Arc;
use std::collections::HashMap;
use bigint::hash::H256;
use ethereum_types::{H256, Address};
use bytes::{Bytes, ToPretty};
use hash_fetch::urlhint::{ContractClient, BoxFuture};
use parking_lot::Mutex;
use rustc_hex::FromHex;
use util::Address;
const REGISTRAR: &'static str = "8e4e9b13d4b45cb0befc93c3061b1408f67316b2";
const URLHINT: &'static str = "deadbeefcafe0000000000000000000000000000";

3
ethcore/Cargo.toml
View File

@ -23,8 +23,7 @@ ethcore-devtools = { path = "../devtools" }
ethcore-io = { path = "../util/io" }
ethcore-logger = { path = "../logger" }
ethcore-stratum = { path = "../stratum" }
ethcore-util = { path = "../util" }
ethcore-bigint = { path = "../util/bigint" }
ethereum-types = "0.1"
memory-cache = { path = "../util/memory_cache" }
ethjson = { path = "../json" }
ethkey = { path = "../ethkey" }

3
ethcore/evm/Cargo.toml
View File

@ -5,8 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
bit-set = "0.4"
ethcore-util = { path = "../../util" }
ethcore-bigint = { path = "../../util/bigint" }
ethereum-types = "0.1"
evmjit = { path = "../../evmjit", optional = true }
heapsize = "0.4"
lazy_static = "0.2"

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

@ -17,7 +17,7 @@
//! Evm interface.
use std::{ops, cmp, fmt};
use bigint::prelude::{U128, U256, U512};
use ethereum_types::{U128, U256, U512};
use vm::{Ext, Result, ReturnData, GasLeft, Error};
/// Finalization result. Gas Left: either it is a known value, or it needs to be computed by processing
@ -149,7 +149,7 @@ impl CostType for usize {
#[cfg(test)]
mod tests {
use bigint::prelude::U256;
use ethereum_types::U256;
use super::CostType;
#[test]

2
ethcore/evm/src/factory.rs
View File

@ -18,7 +18,7 @@
//!
use std::sync::Arc;
use vm::Vm;
use bigint::prelude::U256;
use ethereum_types::U256;
use super::interpreter::SharedCache;
use super::vmtype::VMType;

3
ethcore/evm/src/interpreter/gasometer.rs
View File

@ -15,8 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use std::cmp;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{U256, H256};
use super::u256_to_address;
use {evm, vm};

4
ethcore/evm/src/interpreter/memory.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::prelude::U256;
use ethereum_types::U256;
use vm::ReturnData;
const MAX_RETURN_WASTE_BYTES: usize = 16384;
@ -134,7 +134,7 @@ impl Memory for Vec<u8> {
#[cfg(test)]
mod tests {
use bigint::prelude::U256;
use ethereum_types::U256;
use super::Memory;
#[test]

5
ethcore/evm/src/interpreter/mod.rs
View File

@ -27,8 +27,7 @@ use std::marker::PhantomData;
use std::{cmp, mem};
use std::sync::Arc;
use hash::keccak;
use bigint::prelude::{U256, U512};
use bigint::hash::H256;
use ethereum_types::{U256, U512, H256, Address};
use vm::{
self, ActionParams, ActionValue, CallType, MessageCallResult,
@ -45,8 +44,6 @@ pub use self::shared_cache::SharedCache;
use bit_set::BitSet;
use util::*;
type ProgramCounter = usize;
const ONE: U256 = U256([1, 0, 0, 0]);

2
ethcore/evm/src/interpreter/shared_cache.rs
View File

@ -17,7 +17,7 @@
use std::sync::Arc;
use hash::KECCAK_EMPTY;
use heapsize::HeapSizeOf;
use bigint::hash::H256;
use ethereum_types::H256;
use parking_lot::Mutex;
use memory_cache::MemoryLruCache;
use bit_set::BitSet;

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

@ -17,8 +17,7 @@
//! Ethereum virtual machine.
extern crate bit_set;
extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint;
extern crate ethereum_types;
extern crate parking_lot;
extern crate heapsize;
extern crate vm;

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

@ -20,9 +20,7 @@ use std::hash::Hash;
use std::sync::Arc;
use std::collections::{HashMap, HashSet};
use rustc_hex::FromHex;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::*;
use ethereum_types::{U256, H256, Address};
use vm::{self, ActionParams, ActionValue};
use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
use factory::Factory;

5
ethcore/light/Cargo.toml
View File

@ -9,16 +9,17 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
log = "0.3"
ethcore = { path = ".."}
ethcore-util = { path = "../../util" }
ethcore-bigint = { path = "../../util/bigint" }
ethcore-bytes = { path = "../../util/bytes" }
ethereum-types = "0.1"
memorydb = { path = "../../util/memorydb" }
patricia-trie = { path = "../../util/patricia_trie" }
ethcore-network = { path = "../../util/network" }
ethcore-io = { path = "../../util/io" }
evm = { path = "../evm" }
hashdb = { path = "../../util/hashdb" }
heapsize = "0.4"
vm = { path = "../vm" }
plain_hasher = { path = "../../util/plain_hasher" }
rlp = { path = "../../util/rlp" }
rlp_derive = { path = "../../util/rlp_derive" }
time = "0.1"

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

@ -27,8 +27,7 @@ use ethcore::receipt::Receipt;
use stats::Corpus;
use time::{SteadyTime, Duration};
use heapsize::HeapSizeOf;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use memory_cache::MemoryLruCache;
/// Configuration for how much data to cache.

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

@ -21,9 +21,9 @@
//! we discarded.
use ethcore::ids::BlockId;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::{HashDB, MemoryDB};
use ethereum_types::{H256, U256};
use hashdb::HashDB;
use memorydb::MemoryDB;
use bytes::Bytes;
use trie::{self, TrieMut, TrieDBMut, Trie, TrieDB, Recorder};
use rlp::{RlpStream, UntrustedRlp};

2
ethcore/light/src/client/fetch.rs
View File

@ -24,7 +24,7 @@ use ethcore::machine::EthereumMachine;
use ethcore::header::Header;
use ethcore::receipt::Receipt;
use futures::future::IntoFuture;
use bigint::hash::H256;
use ethereum_types::H256;
/// Provides full chain data.
pub trait ChainDataFetcher: Send + Sync + 'static {

4
ethcore/light/src/client/header_chain.rs
View File

@ -43,8 +43,8 @@ use ethcore::engines::epoch::{
use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp};
use heapsize::HeapSizeOf;
use bigint::prelude::U256;
use bigint::hash::{H256, H256FastMap, H264};
use ethereum_types::{H256, H264, U256};
use plain_hasher::H256FastMap;
use kvdb::{self, DBTransaction, KeyValueDB};
use cache::Cache;

3
ethcore/light/src/client/mod.rs
View File

@ -32,8 +32,7 @@ use ethcore::service::ClientIoMessage;
use ethcore::encoded;
use io::IoChannel;
use parking_lot::{Mutex, RwLock};
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use futures::{IntoFuture, Future};
use kvdb::{self, KeyValueDB};

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

@ -56,16 +56,17 @@ extern crate log;
extern crate bincode;
extern crate ethcore_io as io;
extern crate ethcore_network as network;
extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethereum_types;
extern crate ethcore;
extern crate evm;
extern crate hashdb;
extern crate heapsize;
extern crate futures;
extern crate itertools;
extern crate memorydb;
extern crate patricia_trie as trie;
extern crate plain_hasher;
extern crate rand;
extern crate rlp;
extern crate parking_lot;

5
ethcore/light/src/net/mod.rs
View File

@ -23,9 +23,8 @@ use ethcore::transaction::UnverifiedTransaction;
use io::TimerToken;
use network::{HostInfo, NetworkProtocolHandler, NetworkContext, PeerId};
use rlp::{RlpStream, UntrustedRlp};
use bigint::prelude::U256;
use bigint::hash::H256;
use util::DBValue;
use ethereum_types::{H256, U256};
use kvdb::DBValue;
use parking_lot::{Mutex, RwLock};
use time::{Duration, SteadyTime};

2
ethcore/light/src/net/request_credits.rs
View File

@ -30,7 +30,7 @@ use request::{self, Request};
use super::error::Error;
use rlp::*;
use bigint::prelude::U256;
use ethereum_types::U256;
use time::{Duration, SteadyTime};
/// Credits value.

2
ethcore/light/src/net/request_set.rs
View File

@ -27,7 +27,7 @@ use std::iter::FromIterator;
use request::Request;
use request::NetworkRequests as Requests;
use net::{timeout, ReqId};
use bigint::prelude::U256;
use ethereum_types::U256;
use time::{Duration, SteadyTime};

6
ethcore/light/src/net/status.rs
View File

@ -17,8 +17,7 @@
//! Peer status and capabilities.
use rlp::{DecoderError, Encodable, Decodable, RlpStream, UntrustedRlp};
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use super::request_credits::FlowParams;
@ -374,8 +373,7 @@ pub fn write_announcement(announcement: &Announcement) -> Vec<u8> {
mod tests {
use super::*;
use super::super::request_credits::FlowParams;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{U256, H256};
use rlp::{RlpStream, UntrustedRlp};
#[test]

4
ethcore/light/src/net/tests/mod.rs
View File

@ -32,9 +32,7 @@ use request;
use request::*;
use rlp::*;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, U256, Address};
use std::sync::Arc;

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

@ -31,10 +31,10 @@ use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY, KECCAK_EMPTY_LIST_RLP, keccak};
use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
use rlp::{RlpStream, UntrustedRlp};
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256, Address};
use parking_lot::Mutex;
use util::{Address, DBValue, HashDB};
use hashdb::HashDB;
use kvdb::DBValue;
use bytes::Bytes;
use memorydb::MemoryDB;
use trie::{Trie, TrieDB, TrieError};
@ -941,8 +941,8 @@ impl Signal {
#[cfg(test)]
mod tests {
use super::*;
use bigint::hash::H256;
use util::{MemoryDB, Address};
use ethereum_types::{H256, Address};
use memorydb::MemoryDB;
use parking_lot::Mutex;
use trie::{Trie, TrieMut, SecTrieDB, SecTrieDBMut};
use trie::recorder::Recorder;

2
ethcore/light/src/on_demand/tests.rs
View File

@ -22,7 +22,7 @@ use ethcore::header::{Header, Seal};
use futures::Future;
use network::{PeerId, NodeId};
use net::*;
use bigint::hash::H256;
use ethereum_types::H256;
use parking_lot::Mutex;
use time::Duration;
use ::request::{self as basic_request, Response};

2
ethcore/light/src/provider.rs
View File

@ -24,7 +24,7 @@ use ethcore::client::{BlockChainClient, ProvingBlockChainClient};
use ethcore::transaction::PendingTransaction;
use ethcore::ids::BlockId;
use ethcore::encoded;
use bigint::hash::H256;
use ethereum_types::H256;
use parking_lot::RwLock;
use cht::{self, BlockInfo};

7
ethcore/light/src/transaction_queue.rs
View File

@ -28,9 +28,8 @@ use std::collections::hash_map::Entry;
use ethcore::error::{TransactionError, TransactionImportResult};
use ethcore::transaction::{Condition, PendingTransaction, SignedTransaction};
use bigint::prelude::U256;
use bigint::hash::{H256, H256FastMap};
use util::Address;
use ethereum_types::{H256, U256, Address};
use plain_hasher::H256FastMap;
// Knowledge of an account's current nonce.
#[derive(Debug, Clone, PartialEq, Eq)]
@ -331,7 +330,7 @@ impl TransactionQueue {
#[cfg(test)]
mod tests {
use super::TransactionQueue;
use util::Address;
use ethereum_types::Address;
use ethcore::transaction::{Transaction, PendingTransaction, Condition};
#[test]

2
ethcore/light/src/types/request/batch.rs
View File

@ -211,7 +211,7 @@ impl<T: IncompleteRequest> DerefMut for Batch<T> {
mod tests {
use request::*;
use super::Builder;
use bigint::hash::H256;
use ethereum_types::H256;
#[test]
fn all_scalar() {

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

@ -17,7 +17,7 @@
//! Light protocol request types.
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::hash::H256;
use ethereum_types::H256;
mod batch;
@ -786,8 +786,7 @@ pub mod header {
pub mod header_proof {
use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use bytes::Bytes;
/// Potentially incomplete header proof request.
@ -882,7 +881,7 @@ pub mod header_proof {
/// Request and response for transaction index.
pub mod transaction_index {
use super::{Field, NoSuchOutput, OutputKind, Output};
use bigint::hash::H256;
use ethereum_types::H256;
/// Potentially incomplete transaction index request.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@ -960,7 +959,7 @@ pub mod transaction_index {
pub mod block_receipts {
use super::{Field, NoSuchOutput, OutputKind, Output};
use ethcore::receipt::Receipt;
use bigint::hash::H256;
use ethereum_types::H256;
/// Potentially incomplete block receipts request.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@ -1029,7 +1028,7 @@ pub mod block_body {
use super::{Field, NoSuchOutput, OutputKind, Output};
use ethcore::encoded;
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::hash::H256;
use ethereum_types::H256;
/// Potentially incomplete block body request.
#[derive(Debug, Clone, PartialEq, Eq, RlpEncodable, RlpDecodable)]
@ -1117,8 +1116,7 @@ pub mod block_body {
/// A request for an account proof.
pub mod account {
use super::{Field, NoSuchOutput, OutputKind, Output};
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use bytes::Bytes;
/// Potentially incomplete request for an account proof.
@ -1218,7 +1216,7 @@ pub mod account {
/// A request for a storage proof.
pub mod storage {
use super::{Field, NoSuchOutput, OutputKind, Output};
use bigint::hash::H256;
use ethereum_types::H256;
use bytes::Bytes;
/// Potentially incomplete request for an storage proof.
@ -1327,7 +1325,7 @@ pub mod storage {
/// A request for contract code.
pub mod contract_code {
use super::{Field, NoSuchOutput, OutputKind, Output};
use bigint::hash::H256;
use ethereum_types::H256;
use bytes::Bytes;
/// Potentially incomplete contract code request.
@ -1414,9 +1412,8 @@ pub mod execution {
use super::{Field, NoSuchOutput, OutputKind, Output};
use ethcore::transaction::Action;
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::prelude::U256;
use bigint::hash::H256;
use util::{Address, DBValue};
use ethereum_types::{H256, U256, Address};
use kvdb::DBValue;
use bytes::Bytes;
/// Potentially incomplete execution proof request.
@ -1540,7 +1537,7 @@ pub mod execution {
pub mod epoch_signal {
use super::{Field, NoSuchOutput, OutputKind, Output};
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};
use bigint::hash::H256;
use ethereum_types::H256;
use bytes::Bytes;
/// Potentially incomplete epoch signal request.
@ -1725,7 +1722,7 @@ mod tests {
let full_req = Request::TransactionIndex(req.clone());
let res = TransactionIndexResponse {
num: 1000,
hash: ::bigint::hash::H256::random(),
hash: ::ethereum_types::H256::random(),
index: 4,
};
let full_res = Response::TransactionIndex(res.clone());
@ -1848,7 +1845,7 @@ mod tests {
#[test]
fn execution_roundtrip() {
use util::DBValue;
use kvdb::DBValue;
let req = IncompleteExecutionRequest {
block_hash: Field::Scalar(Default::default()),

2
ethcore/native_contracts/Cargo.toml
View File

@ -9,7 +9,7 @@ build = "build.rs"
ethabi = "4.0"
futures = "0.1"
byteorder = "1.0"
ethcore-bigint = { path = "../../util/bigint" }
ethereum-types = "0.1"
[build-dependencies]
native-contract-generator = { path = "generator" }

40
ethcore/native_contracts/generator/src/lib.rs
View File

@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
//! Rust code contract generator.
//! The code generated will require a dependence on the `ethcore-bigint::prelude`,
//! The code generated will require a dependence on the `ethcore-ethereum_types`,
//! `ethabi`, `byteorder`, and `futures` crates.
//! This currently isn't hygienic, so compilation of generated code may fail
//! due to missing crates or name collisions. This will change when
@ -47,7 +47,7 @@ pub fn generate_module(struct_name: &str, abi: &str) -> Result<String, Error> {
use byteorder::{{BigEndian, ByteOrder}};
use futures::{{future, Future, IntoFuture}};
use ethabi::{{Bytes, Contract, Token, Event}};
use bigint;
use ethereum_types;
type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
@ -56,7 +56,7 @@ type BoxFuture<A, B> = Box<Future<Item = A, Error = B> + Send>;
pub struct {name} {{
contract: Contract,
/// Address to make calls to.
pub address: bigint::prelude::H160,
pub address: ethereum_types::H160,
}}
const ABI: &'static str = r#"{abi_str}"#;
@ -64,7 +64,7 @@ const ABI: &'static str = r#"{abi_str}"#;
impl {name} {{
/// Create a new instance of `{name}` with an address.
/// Calls can be made, given a callback for dispatching calls asynchronously.
pub fn new(address: bigint::prelude::H160) -> Self {{
pub fn new(address: ethereum_types::H160) -> Self {{
let contract = Contract::load(ABI.as_bytes())
.expect("ABI checked at generation-time; qed");
{name} {{
@ -109,7 +109,7 @@ fn generate_functions(contract: &Contract) -> Result<String, Error> {
/// Outputs: {abi_outputs:?}
pub fn {snake_name}<F, U>(&self, call: F, {params}) -> BoxFuture<{output_type}, String>
where
F: FnOnce(bigint::prelude::H160, Vec<u8>) -> U,
F: FnOnce(ethereum_types::H160, Vec<u8>) -> U,
U: IntoFuture<Item=Vec<u8>, Error=String>,
U::Future: Send + 'static
{{
@ -231,8 +231,8 @@ fn output_params_codegen(outputs: &[ParamType]) -> Result<(String, String), Para
// create code for an argument type from param type.
fn rust_type(input: ParamType) -> Result<String, ParamType> {
Ok(match input {
ParamType::Address => "bigint::prelude::H160".into(),
ParamType::FixedBytes(len) if len <= 32 => format!("bigint::prelude::H{}", len * 8),
ParamType::Address => "ethereum_types::H160".into(),
ParamType::FixedBytes(len) if len <= 32 => format!("ethereum_types::H{}", len * 8),
ParamType::Bytes | ParamType::FixedBytes(_) => "Vec<u8>".into(),
ParamType::Int(width) => match width {
8 | 16 | 32 | 64 => format!("i{}", width),
@ -240,7 +240,7 @@ fn rust_type(input: ParamType) -> Result<String, ParamType> {
},
ParamType::Uint(width) => match width {
8 | 16 | 32 | 64 => format!("u{}", width),
128 | 160 | 256 => format!("bigint::prelude::U{}", width),
128 | 160 | 256 => format!("ethereum_types::U{}", width),
_ => return Err(ParamType::Uint(width)),
},
ParamType::Bool => "bool".into(),
@ -273,8 +273,8 @@ fn tokenize(name: &str, input: ParamType) -> (bool, String) {
},
ParamType::Uint(width) => format!(
"let mut r = [0; 32]; {}.to_big_endian(&mut r); Token::Uint(r)",
if width <= 64 { format!("bigint::prelude::U256::from({} as u64)", name) }
else { format!("bigint::prelude::U256::from({})", name) }
if width <= 64 { format!("ethereum_types::U256::from({} as u64)", name) }
else { format!("ethereum_types::U256::from({})", name) }
),
ParamType::Bool => format!("Token::Bool({})", name),
ParamType::String => format!("Token::String({})", name),
@ -295,11 +295,11 @@ fn tokenize(name: &str, input: ParamType) -> (bool, String) {
// panics on unsupported types.
fn detokenize(name: &str, output_type: ParamType) -> String {
match output_type {
ParamType::Address => format!("{}.to_address().map(bigint::prelude::H160)", name),
ParamType::Address => format!("{}.to_address().map(ethereum_types::H160)", name),
ParamType::Bytes => format!("{}.to_bytes()", name),
ParamType::FixedBytes(len) if len <= 32 => {
// ensure no panic on slice too small.
let read_hash = format!("b.resize({}, 0); bigint::prelude::H{}::from_slice(&b[..{}])",
let read_hash = format!("b.resize({}, 0); ethereum_types::H{}::from_slice(&b[..{}])",
len, len * 8, len);
format!("{}.to_fixed_bytes().map(|mut b| {{ {} }})",
@ -318,7 +318,7 @@ fn detokenize(name: &str, output_type: ParamType) -> String {
let read_uint = match width {
8 => "u[31] as u8".into(),
16 | 32 | 64 => format!("BigEndian::read_u{}(&u[{}..])", width, 32 - (width / 8)),
_ => format!("bigint::prelude::U{}::from(&u[..])", width),
_ => format!("ethereum_types::U{}::from(&u[..])", width),
};
format!("{}.to_uint().map(|u| {})", name, read_uint)
@ -343,30 +343,30 @@ mod tests {
#[test]
fn input_types() {
assert_eq!(::input_params_codegen(&[]).unwrap().0, "");
assert_eq!(::input_params_codegen(&[ParamType::Address]).unwrap().0, "param_0: bigint::prelude::H160, ");
assert_eq!(::input_params_codegen(&[ParamType::Address]).unwrap().0, "param_0: ethereum_types::H160, ");
assert_eq!(::input_params_codegen(&[ParamType::Address, ParamType::Bytes]).unwrap().0,
"param_0: bigint::prelude::H160, param_1: Vec<u8>, ");
"param_0: ethereum_types::H160, param_1: Vec<u8>, ");
}
#[test]
fn output_types() {
assert_eq!(::output_params_codegen(&[]).unwrap().0, "()");
assert_eq!(::output_params_codegen(&[ParamType::Address]).unwrap().0, "(bigint::prelude::H160)");
assert_eq!(::output_params_codegen(&[ParamType::Address]).unwrap().0, "(ethereum_types::H160)");
assert_eq!(::output_params_codegen(&[ParamType::Address, ParamType::Array(Box::new(ParamType::Bytes))]).unwrap().0,
"(bigint::prelude::H160, Vec<Vec<u8>>)");
"(ethereum_types::H160, Vec<Vec<u8>>)");
}
#[test]
fn rust_type() {
assert_eq!(::rust_type(ParamType::FixedBytes(32)).unwrap(), "bigint::prelude::H256");
assert_eq!(::rust_type(ParamType::FixedBytes(32)).unwrap(), "ethereum_types::H256");
assert_eq!(::rust_type(ParamType::Array(Box::new(ParamType::FixedBytes(32)))).unwrap(),
"Vec<bigint::prelude::H256>");
"Vec<ethereum_types::H256>");
assert_eq!(::rust_type(ParamType::Uint(64)).unwrap(), "u64");
assert!(::rust_type(ParamType::Uint(63)).is_err());
assert_eq!(::rust_type(ParamType::Int(32)).unwrap(), "i32");
assert_eq!(::rust_type(ParamType::Uint(256)).unwrap(), "bigint::prelude::U256");
assert_eq!(::rust_type(ParamType::Uint(256)).unwrap(), "ethereum_types::U256");
}
// codegen tests will need bootstrapping of some kind.

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

@ -21,7 +21,7 @@
extern crate futures;
extern crate byteorder;
extern crate ethabi;
extern crate ethcore_bigint as bigint;
extern crate ethereum_types;
mod key_server_set;
mod registry;

3
ethcore/node_filter/Cargo.toml
View File

@ -8,10 +8,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
ethcore = { path = ".."}
ethcore-util = { path = "../../util" }
ethcore-bigint = { path = "../../util/bigint" }
ethcore-bytes = { path = "../../util/bytes" }
ethcore-network = { path = "../../util/network" }
ethereum-types = "0.1"
native-contracts = { path = "../native_contracts" }
futures = "0.1"
log = "0.3"

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

@ -17,10 +17,9 @@
//! Smart contract based node filter.
extern crate ethcore;
extern crate ethcore_util as util;
extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethcore_network as network;
extern crate ethereum_types;
extern crate native_contracts;
extern crate futures;
extern crate parking_lot;
@ -38,8 +37,7 @@ use std::collections::HashMap;
use native_contracts::PeerSet as Contract;
use network::{NodeId, ConnectionFilter, ConnectionDirection};
use ethcore::client::{BlockChainClient, BlockId, ChainNotify};
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use bytes::Bytes;
use parking_lot::Mutex;
use futures::Future;
@ -129,7 +127,7 @@ mod test {
use ethcore::spec::Spec;
use ethcore::client::{BlockChainClient, Client, ClientConfig};
use ethcore::miner::Miner;
use util::{Address};
use ethereum_types::Address;
use network::{ConnectionDirection, ConnectionFilter, NodeId};
use io::IoChannel;
use super::NodeFilter;

8
ethcore/src/account_db.rs
View File

@ -17,10 +17,14 @@
//! DB backend wrapper for Account trie
use std::collections::HashMap;
use hash::{KECCAK_NULL_RLP, keccak};
use bigint::hash::H256;
use util::*;
use ethereum_types::H256;
use kvdb::DBValue;
use hashdb::HashDB;
use rlp::NULL_RLP;
#[cfg(test)]
use ethereum_types::Address;
// combines a key with an address hash to ensure uniqueness.
// leaves the first 96 bits untouched in order to support partial key lookup.
#[inline]

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

@ -840,7 +840,7 @@ mod tests {
use std::time::Instant;
use ethstore::ethkey::{Generator, Random, Address};
use ethstore::{StoreAccountRef, Derivation};
use bigint::hash::H256;
use ethereum_types::H256;
#[test]
fn unlock_account_temp() {

4
ethcore/src/basic_types.rs
View File

@ -17,10 +17,10 @@
//! Ethcore basic typenames.
/// Type for a 2048-bit log-bloom, as used by our blocks.
pub type LogBloom = ::log_entry::LogBloom;
pub use ethereum_types::LogBloom;
/// Constant 2048-bit datum for 0. Often used as a default.
pub static ZERO_LOGBLOOM: LogBloom = ::bigint::hash::H2048([0x00; 256]);
pub static ZERO_LOGBLOOM: LogBloom = ::ethereum_types::H2048([0x00; 256]);
/// Semantic boolean for when a seal/signature is included.
pub enum Seal {

6
ethcore/src/block.rs
View File

@ -23,9 +23,7 @@ use hash::{keccak, KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP};
use triehash::ordered_trie_root;
use rlp::{UntrustedRlp, RlpStream, Encodable, Decodable, DecoderError};
use bigint::prelude::U256;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, U256, Address};
use bytes::Bytes;
use unexpected::{Mismatch, OutOfBounds};
@ -723,7 +721,7 @@ mod tests {
use factory::Factories;
use state_db::StateDB;
use views::BlockView;
use util::Address;
use ethereum_types::Address;
use std::sync::Arc;
use transaction::SignedTransaction;

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

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use bytes::Bytes;
use header::BlockNumber;

3
ethcore/src/blockchain/block_info.rs
View File

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use header::BlockNumber;
/// Brief info about inserted block.

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

@ -22,8 +22,7 @@ use std::mem;
use itertools::Itertools;
use bloomchain as bc;
use heapsize::HeapSizeOf;
use bigint::prelude::U256;
use bigint::hash::{H256, H2048};
use ethereum_types::{H256, H2048, U256};
use parking_lot::{Mutex, RwLock};
use bytes::Bytes;
use rlp::*;
@ -634,7 +633,7 @@ impl BlockChain {
return None;
}
if let Some(extras) = self.db.read(db::COL_EXTRA, &best_block_hash) as Option<BlockDetails> {
type DetailsKey = Key<BlockDetails, Target=::bigint::hash::H264>;
type DetailsKey = Key<BlockDetails, Target=::ethereum_types::H264>;
batch.delete(db::COL_EXTRA, &(DetailsKey::key(&best_block_hash)));
let hash = extras.parent;
let range = extras.number as bc::Number .. extras.number as bc::Number;
@ -1479,7 +1478,7 @@ mod tests {
use hash::keccak;
use kvdb::KeyValueDB;
use kvdb_memorydb;
use bigint::hash::*;
use ethereum_types::*;
use receipt::{Receipt, TransactionOutcome};
use blockchain::{BlockProvider, BlockChain, Config, ImportRoute};
use tests::helpers::*;

3
ethcore/src/blockchain/extras.rs
View File

@ -26,8 +26,7 @@ use header::BlockNumber;
use receipt::Receipt;
use heapsize::HeapSizeOf;
use bigint::prelude::U256;
use bigint::hash::{H256, H264};
use ethereum_types::{H256, H264, U256};
use kvdb::PREFIX_LEN as DB_PREFIX_LEN;
/// Represents index of extra data in database

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

@ -15,7 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use rlp::*;
use bigint::hash::{H256, H2048};
use ethereum_types::{H256, H2048};
use bytes::Bytes;
use header::Header;
use transaction::SignedTransaction;

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

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::hash::H2048;
use ethereum_types::H2048;
pub trait WithBloom {
fn with_bloom(self, bloom: H2048) -> Self where Self: Sized;

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

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::hash::H256;
use ethereum_types::H256;
use bytes::Bytes;
use views::BlockView;

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

@ -14,8 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::prelude::U256;
use bigint::hash::H2048;
use ethereum_types::{H2048, U256};
use bytes::Bytes;
use header::BlockNumber;
use transaction::SignedTransaction;
@ -112,7 +111,7 @@ impl Iterator for ChainGenerator {
}
mod tests {
use bigint::hash::{H256, H2048};
use ethereum_types::{H256, H2048};
use views::BlockView;
use blockchain::generator::{ChainIterator, ChainGenerator, BlockFinalizer};

5
ethcore/src/blockchain/import_route.rs
View File

@ -16,7 +16,7 @@
//! Import route.
use bigint::hash::H256;
use ethereum_types::H256;
use blockchain::block_info::{BlockInfo, BlockLocation};
/// Import route for newly inserted block.
@ -67,8 +67,7 @@ impl From<BlockInfo> for ImportRoute {
#[cfg(test)]
mod tests {
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use blockchain::block_info::{BlockInfo, BlockLocation, BranchBecomingCanonChainData};
use blockchain::ImportRoute;

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

@ -1,5 +1,5 @@
use std::collections::HashMap;
use bigint::hash::H256;
use ethereum_types::H256;
use header::BlockNumber;
use blockchain::block_info::BlockInfo;
use blooms::BloomGroup;

5
ethcore/src/builtin.rs
View File

@ -24,8 +24,7 @@ use crypto::digest::Digest;
use num::{BigUint, Zero, One};
use hash::keccak;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use bytes::BytesRef;
use ethkey::{Signature, recover as ec_recover};
use ethjson;
@ -551,7 +550,7 @@ impl Bn128PairingImpl {
mod tests {
use super::{Builtin, Linear, ethereum_builtin, Pricer, ModexpPricer, modexp as me};
use ethjson;
use bigint::prelude::U256;
use ethereum_types::U256;
use bytes::BytesRef;
use rustc_hex::FromHex;
use num::{BigUint, Zero, One};

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

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::hash::H256;
use ethereum_types::H256;
use bytes::Bytes;
/// Represents what has to be handled by actor listening to chain events

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

@ -26,15 +26,13 @@ use itertools::Itertools;
use hash::keccak;
use timer::PerfTimer;
use bytes::Bytes;
use util::{Address, DBValue};
use journaldb;
use util_error::UtilError;
use trie::{TrieSpec, TrieFactory, Trie};
use kvdb::{KeyValueDB, DBTransaction};
use kvdb::{DBValue, KeyValueDB, DBTransaction};
// other
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, Address, U256};
use basic_types::Seal;
use block::*;
use blockchain::{BlockChain, BlockProvider, TreeRoute, ImportRoute};

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

@ -18,8 +18,7 @@
use std::fmt;
use std::sync::Arc;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use journaldb;
use {trie, kvdb_memorydb, bytes};
use kvdb::{self, KeyValueDB};

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

@ -23,11 +23,10 @@ use std::mem;
use itertools::Itertools;
use rustc_hex::FromHex;
use hash::keccak;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256, Address};
use parking_lot::RwLock;
use journaldb;
use util::{Address, DBValue};
use kvdb::DBValue;
use kvdb_rocksdb::{Database, DatabaseConfig};
use bytes::Bytes;
use rlp::*;

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

@ -1,7 +1,7 @@
//! Bridge between Tracedb and Blockchain.
use bigint::hash::H256;
use ethereum_types::H256;
use header::BlockNumber;
use trace::DatabaseExtras as TraceDatabaseExtras;
use blockchain::{BlockChain, BlockProvider};

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

@ -33,9 +33,7 @@ use trace::LocalizedTrace;
use transaction::{LocalizedTransaction, PendingTransaction, SignedTransaction};
use verification::queue::QueueInfo as BlockQueueInfo;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, U256, Address};
use bytes::Bytes;
use hashdb::DBValue;

4
ethcore/src/encoded.rs
View File

@ -30,9 +30,7 @@ use views;
use hash::keccak;
use heapsize::HeapSizeOf;
use bigint::prelude::U256;
use bigint::hash::{H256, H2048};
use util::Address;
use ethereum_types::{H256, H2048, U256, Address};
use rlp::Rlp;
/// Owning header view.

6
ethcore/src/engines/authority_round/finality.rs
View File

@ -19,8 +19,7 @@
use std::collections::{VecDeque};
use std::collections::hash_map::{HashMap, Entry};
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use engines::validator_set::SimpleList;
@ -150,8 +149,7 @@ impl<'a> Iterator for Iter<'a> {
#[cfg(test)]
mod tests {
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use super::RollingFinality;
#[test]

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

@ -39,12 +39,10 @@ use ethkey::{verify_address, Signature};
use io::{IoContext, IoHandler, TimerToken, IoService};
use itertools::{self, Itertools};
use rlp::{UntrustedRlp, encode};
use bigint::prelude::{U256, U128};
use bigint::hash::{H256, H520};
use ethereum_types::{H256, H520, Address, U128, U256};
use semantic_version::SemanticVersion;
use parking_lot::{Mutex, RwLock};
use unexpected::{Mismatch, OutOfBounds};
use util::*;
use bytes::Bytes;
mod finality;
@ -909,8 +907,7 @@ mod tests {
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
use hash::keccak;
use bigint::prelude::U256;
use bigint::hash::H520;
use ethereum_types::{H520, U256};
use header::Header;
use rlp::encode;
use block::*;

5
ethcore/src/engines/basic_authority.rs
View File

@ -17,9 +17,8 @@
//! A blockchain engine that supports a basic, non-BFT proof-of-authority.
use std::sync::{Weak, Arc};
use bigint::hash::{H256, H520};
use ethereum_types::{H256, H520, Address};
use parking_lot::RwLock;
use util::*;
use ethkey::{recover, public_to_address, Signature};
use account_provider::AccountProvider;
use block::*;
@ -200,7 +199,7 @@ impl Engine<EthereumMachine> for BasicAuthority {
mod tests {
use std::sync::Arc;
use hash::keccak;
use bigint::hash::H520;
use ethereum_types::H520;
use block::*;
use tests::helpers::*;
use account_provider::AccountProvider;

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

@ -16,7 +16,7 @@
//! Epoch verifiers and transitions.
use bigint::hash::H256;
use ethereum_types::H256;
use rlp::{Encodable, Decodable, DecoderError, RlpStream, UntrustedRlp};

3
ethcore/src/engines/instant_seal.rs
View File

@ -55,8 +55,7 @@ impl<M: Machine> Engine<M> for InstantSeal<M>
#[cfg(test)]
mod tests {
use std::sync::Arc;
use bigint::hash::H520;
use util::*;
use ethereum_types::{H520, Address};
use tests::helpers::*;
use spec::Spec;
use header::Header;

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

@ -52,10 +52,8 @@ use transaction::{UnverifiedTransaction, SignedTransaction};
use ethkey::Signature;
use parity_machine::{Machine, LocalizedMachine as Localized};
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256, Address};
use semantic_version::SemanticVersion;
use util::*;
use unexpected::{Mismatch, OutOfBounds};
use bytes::Bytes;
@ -411,7 +409,7 @@ pub mod common {
use trace::{Tracer, ExecutiveTracer, RewardType};
use state::CleanupMode;
use bigint::prelude::U256;
use ethereum_types::U256;
/// Give reward and trace.
pub fn bestow_block_reward(block: &mut ExecutedBlock, reward: U256) -> Result<(), Error> {

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

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::prelude::U256;
use ethereum_types::U256;
use engines::Engine;
use header::BlockNumber;
use parity_machine::{Header, LiveBlock, WithBalances};

3
ethcore/src/engines/signer.rs
View File

@ -17,8 +17,7 @@
//! A signer used by Engines which need to sign messages.
use std::sync::Arc;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use ethkey::Signature;
use account_provider::{self, AccountProvider};

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

@ -18,8 +18,7 @@
use std::cmp;
use hash::keccak;
use bigint::hash::{H256, H520};
use util::*;
use ethereum_types::{H256, H520, Address};
use bytes::Bytes;
use super::{Height, View, BlockHash, Step};
use error::Error;

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

@ -29,10 +29,8 @@ use std::sync::{Weak, Arc};
use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
use std::collections::{HashSet, BTreeMap};
use hash::keccak;
use bigint::prelude::{U128, U256};
use bigint::hash::{H256, H520};
use ethereum_types::{H256, H520, U128, U256, Address};
use parking_lot::RwLock;
use util::*;
use unexpected::{OutOfBounds, Mismatch};
use client::EngineClient;
use bytes::Bytes;
@ -777,7 +775,7 @@ impl Engine<EthereumMachine> for Tendermint {
mod tests {
use std::str::FromStr;
use rustc_hex::FromHex;
use util::*;
use ethereum_types::Address;
use bytes::Bytes;
use block::*;
use error::{Error, BlockError};

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

@ -18,7 +18,7 @@
use ethjson;
use time::Duration;
use bigint::prelude::U256;
use ethereum_types::U256;
use super::super::validator_set::{ValidatorSet, new_validator_set};
use super::super::transition::Timeouts;
use super::Step;

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

@ -18,9 +18,8 @@
/// It can also report validators for misbehaviour with two levels: `reportMalicious` and `reportBenign`.
use std::sync::Weak;
use bigint::hash::H256;
use ethereum_types::{H256, Address};
use parking_lot::RwLock;
use util::*;
use bytes::Bytes;
use futures::Future;
@ -137,8 +136,7 @@ mod tests {
use std::sync::Arc;
use rustc_hex::FromHex;
use hash::keccak;
use bigint::hash::H520;
use util::*;
use ethereum_types::{H520, Address};
use bytes::ToPretty;
use rlp::encode;
use spec::Spec;

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

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

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

@ -18,9 +18,8 @@
use std::collections::BTreeMap;
use std::sync::Weak;
use bigint::hash::H256;
use ethereum_types::{H256, Address};
use parking_lot::RwLock;
use util::Address;
use bytes::Bytes;
use ids::BlockId;
use header::{BlockNumber, Header};
@ -158,7 +157,7 @@ mod tests {
use spec::Spec;
use tests::helpers::{generate_dummy_client_with_spec_and_accounts, generate_dummy_client_with_spec_and_data};
use types::ids::BlockId;
use util::*;
use ethereum_types::Address;
use super::Multi;

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

@ -21,15 +21,14 @@ use futures::Future;
use native_contracts::ValidatorSet as Provider;
use hash::keccak;
use bigint::prelude::U256;
use bigint::hash::{H160, H256};
use ethereum_types::{H160, H256, U256, Address};
use parking_lot::{Mutex, RwLock};
use util::*;
use bytes::Bytes;
use memory_cache::MemoryLruCache;
use unexpected::Mismatch;
use rlp::{UntrustedRlp, RlpStream};
use kvdb::DBValue;
use basic_types::LogBloom;
use client::EngineClient;
@ -471,7 +470,7 @@ mod tests {
use std::sync::Arc;
use rustc_hex::FromHex;
use hash::keccak;
use util::*;
use ethereum_types::Address;
use types::ids::BlockId;
use spec::Spec;
use account_provider::AccountProvider;

5
ethcore/src/engines/validator_set/simple_list.rs
View File

@ -17,8 +17,7 @@
/// Preconfigured validator list.
use heapsize::HeapSizeOf;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use machine::{AuxiliaryData, Call, EthereumMachine};
use header::{BlockNumber, Header};
@ -108,7 +107,7 @@ impl ValidatorSet for SimpleList {
#[cfg(test)]
mod tests {
use std::str::FromStr;
use util::Address;
use ethereum_types::Address;
use super::super::ValidatorSet;
use super::SimpleList;

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

@ -20,8 +20,7 @@ use std::str::FromStr;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
use heapsize::HeapSizeOf;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, Address};
use bytes::Bytes;
use machine::{AuxiliaryData, Call, EthereumMachine};

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

@ -19,9 +19,8 @@
use std::fmt::Debug;
use std::collections::{BTreeMap, HashSet, HashMap};
use std::hash::Hash;
use bigint::hash::{H256, H520};
use ethereum_types::{H256, H520, Address};
use parking_lot:: RwLock;
use util::*;
use bytes::Bytes;
use rlp::{Encodable, RlpStream};
@ -210,8 +209,7 @@ impl <M: Message + Default + Encodable + Debug> VoteCollector<M> {
#[cfg(test)]
mod tests {
use hash::keccak;
use bigint::hash::H160;
use util::*;
use ethereum_types::{H160, H256};
use rlp::*;
use super::*;

4
ethcore/src/error.rs
View File

@ -18,9 +18,7 @@
use std::fmt;
use kvdb;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::*;
use ethereum_types::{H256, U256, Address};
use util_error::UtilError;
use snappy::InvalidInput;
use unexpected::{Mismatch, OutOfBounds};

2
ethcore/src/ethereum/denominations.rs
View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
use bigint::prelude::U256;
use ethereum_types::U256;
#[inline]
/// 1 Ether in Wei

8
ethcore/src/ethereum/ethash.rs
View File

@ -20,9 +20,7 @@ use std::collections::BTreeMap;
use std::sync::Arc;
use hash::{KECCAK_EMPTY_LIST_RLP};
use ethash::{quick_get_difficulty, slow_hash_block_number, EthashManager, OptimizeFor};
use bigint::prelude::U256;
use bigint::hash::{H256, H64};
use util::Address;
use ethereum_types::{H256, H64, U256, Address};
use unexpected::{OutOfBounds, Mismatch};
use block::*;
use error::{BlockError, Error};
@ -472,9 +470,7 @@ fn ecip1017_eras_block_reward(era_rounds: u64, mut reward: U256, block_number:u6
mod tests {
use std::str::FromStr;
use std::sync::Arc;
use bigint::prelude::U256;
use bigint::hash::{H64, H256};
use util::*;
use ethereum_types::{H64, H256, U256, Address};
use block::*;
use tests::helpers::*;
use error::{BlockError, Error};

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

@ -143,7 +143,7 @@ pub fn new_mcip3_test_machine() -> EthereumMachine { load_machine(include_bytes!
#[cfg(test)]
mod tests {
use bigint::prelude::U256;
use ethereum_types::U256;
use state::*;
use super::*;
use tests::helpers::*;

3
ethcore/src/executed.rs
View File

@ -16,8 +16,7 @@
//! Transaction execution format module.
use bigint::prelude::{U256, U512};
use util::Address;
use ethereum_types::{U256, U512, Address};
use bytes::Bytes;
use trie;
use vm;

8
ethcore/src/executive.rs
View File

@ -18,9 +18,7 @@
use std::cmp;
use std::sync::Arc;
use hash::keccak;
use bigint::prelude::{U256, U512};
use bigint::hash::H256;
use util::*;
use ethereum_types::{H256, U256, U512, Address};
use bytes::{Bytes, BytesRef};
use state::{Backend as StateBackend, State, Substate, CleanupMode};
use machine::EthereumMachine as Machine;
@ -702,9 +700,7 @@ mod tests {
use rustc_hex::FromHex;
use ethkey::{Generator, Random};
use super::*;
use bigint::prelude::{U256, U512};
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, U256, U512, Address};
use bytes::BytesRef;
use vm::{ActionParams, ActionValue, CallType, EnvInfo, CreateContractAddress};
use evm::{Factory, VMType};

6
ethcore/src/externalities.rs
View File

@ -17,9 +17,7 @@
//! Transaction Execution environment.
use std::cmp;
use std::sync::Arc;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::*;
use ethereum_types::{H256, U256, Address};
use bytes::{Bytes, BytesRef};
use state::{Backend as StateBackend, State, Substate, CleanupMode};
use machine::EthereumMachine as Machine;
@ -413,7 +411,7 @@ impl<'a, T: 'a, V: 'a, B: 'a> Ext for Externalities<'a, T, V, B>
#[cfg(test)]
mod tests {
use util::*;
use ethereum_types::{U256, Address};
use evm::{EnvInfo, Ext, CallType};
use state::{State, Substate};
use tests::helpers::*;

4
ethcore/src/header.rs
View File

@ -20,9 +20,7 @@ use std::cmp;
use std::cell::RefCell;
use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY_LIST_RLP, keccak};
use heapsize::HeapSizeOf;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::*;
use ethereum_types::{H256, U256, Address};
use bytes::Bytes;
use basic_types::{LogBloom, ZERO_LOGBLOOM};
use time::get_time;

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

@ -16,7 +16,7 @@
use ethjson;
use header::Header;
use bigint::prelude::U256;
use ethereum_types::U256;
use spec::Spec;
pub fn json_difficulty_test(json_data: &[u8], spec: Spec) -> Vec<String> {

4
ethcore/src/json_tests/test_common.rs
View File

@ -14,14 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
pub use bigint::prelude::U256;
pub use bigint::hash::H256;
pub use util::*;
use std::collections::HashSet;
use std::io::Read;
use std::fs::{File, read_dir};
use std::path::Path;
use std::ffi::OsString;
pub use ethereum_types::{H256, U256, Address};
pub fn run_test_path(p: &Path, skip: &[&'static str], runner: fn (json_data: &[u8]) -> Vec<String>) {
let path = Path::new(p);

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

@ -16,7 +16,7 @@
use ethjson;
use trie::{TrieFactory, TrieSpec};
use bigint::hash::H256;
use ethereum_types::H256;
use memorydb::MemoryDB;
fn test_trie(json: &[u8], trie: TrieSpec) -> Vec<String> {

3
ethcore/src/lib.rs
View File

@ -64,10 +64,10 @@ extern crate ethash;
extern crate ethcore_bloom_journal as bloom_journal;
extern crate ethcore_devtools as devtools;
extern crate ethcore_io as io;
extern crate ethcore_bigint as bigint;
extern crate ethcore_bytes as bytes;
extern crate ethcore_logger;
extern crate ethcore_stratum;
extern crate ethereum_types;
extern crate ethjson;
extern crate ethkey;
extern crate futures;
@ -112,7 +112,6 @@ extern crate table;
extern crate bloomable;
extern crate vm;
extern crate wasm;
extern crate ethcore_util as util;
extern crate memory_cache;
extern crate journaldb;

5
ethcore/src/machine.rs
View File

@ -32,9 +32,8 @@ use trace::{NoopTracer, NoopVMTracer, Tracer, ExecutiveTracer, RewardType};
use transaction::{SYSTEM_ADDRESS, UnverifiedTransaction, SignedTransaction};
use tx_filter::TransactionFilter;
use bigint::prelude::U256;
use ethereum_types::{U256, Address};
use bytes::BytesRef;
use util::Address;
use vm::{CallType, ActionParams, ActionValue, ParamsType};
use vm::{EnvInfo, Schedule, CreateContractAddress};
@ -489,7 +488,7 @@ mod tests {
#[test]
fn ethash_gas_limit_is_multiple_of_determinant() {
use bigint::prelude::U256;
use ethereum_types::U256;
let spec = ::ethereum::new_homestead_test();
let ethparams = ::tests::helpers::get_default_ethash_extensions();

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

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

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

@ -24,7 +24,7 @@ use views::HeaderView;
use bloom_journal::Bloom;
use migration::{Error, Migration, Progress, Batch, Config, ErrorKind};
use journaldb;
use bigint::hash::H256;
use ethereum_types::H256;
use trie::Trie;
use kvdb::{DBTransaction, ResultExt};
use kvdb_rocksdb::Database;

7
ethcore/src/miner/banning_queue.rs
View File

@ -24,9 +24,7 @@ use transient_hashmap::TransientHashMap;
use miner::{TransactionQueue, TransactionQueueDetailsProvider, TransactionImportResult, TransactionOrigin};
use miner::transaction_queue::QueuingInstant;
use error::{Error, TransactionError};
use bigint::prelude::U256;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, U256, Address};
use hash::keccak;
type Count = u16;
@ -220,8 +218,7 @@ mod tests {
use error::{Error, TransactionError};
use client::TransactionImportResult;
use miner::{TransactionQueue, TransactionOrigin};
use bigint::prelude::U256;
use util::Address;
use ethereum_types::{U256, Address};
use miner::transaction_queue::test::DummyTransactionDetailsProvider;
fn queue() -> BanningTransactionQueue {

6
ethcore/src/miner/external.rs
View File

@ -17,8 +17,7 @@
use std::collections::HashMap;
use std::sync::Arc;
use std::time::{Instant, Duration};
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
use parking_lot::Mutex;
/// External miner interface.
@ -72,8 +71,7 @@ mod tests {
use super::*;
use std::thread::sleep;
use std::time::Duration;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
fn miner() -> ExternalMiner {
ExternalMiner::default()

5
ethcore/src/miner/local_transactions.rs
View File

@ -19,8 +19,7 @@
use linked_hash_map::LinkedHashMap;
use transaction::{SignedTransaction, PendingTransaction};
use error::TransactionError;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256};
/// Status of local transaction.
/// Can indicate that the transaction is currently part of the queue (`Pending/Future`)
@ -153,7 +152,7 @@ impl LocalTransactionsList {
#[cfg(test)]
mod tests {
use bigint::prelude::U256;
use ethereum_types::U256;
use ethkey::{Random, Generator};
use transaction::{Action, Transaction, SignedTransaction};
use super::{LocalTransactionsList, Status};

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

@ -18,10 +18,8 @@ use std::time::{Instant, Duration};
use std::collections::{BTreeMap, HashSet};
use std::sync::Arc;
use bigint::prelude::U256;
use bigint::hash::H256;
use ethereum_types::{H256, U256, Address};
use parking_lot::{Mutex, RwLock};
use util::*;
use bytes::Bytes;
use timer::PerfTimer;
use using_queue::{UsingQueue, GetAction};
@ -1273,7 +1271,7 @@ mod tests {
use super::super::{MinerService, PrioritizationStrategy};
use super::*;
use block::IsBlock;
use bigint::prelude::U256;
use ethereum_types::U256;
use ethkey::{Generator, Random};
use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult};
use header::BlockNumber;

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

@ -22,7 +22,6 @@
//! Usage example:
//!
//! ```rust
//! extern crate ethcore_util as util;
//! extern crate ethcore;
//! use std::env;
//! use ethcore::ethereum;
@ -59,9 +58,7 @@ pub use self::work_notify::NotifyWork;
pub use self::stratum::{Stratum, Error as StratumError, Options as StratumOptions};
use std::collections::BTreeMap;
use bigint::prelude::U256;
use bigint::hash::H256;
use util::Address;
use ethereum_types::{H256, U256, Address};
use bytes::Bytes;
use client::{MiningBlockChainClient};
use block::ClosedBlock;

2
ethcore/src/miner/service_transaction_checker.rs
View File

@ -20,7 +20,7 @@ use types::ids::BlockId;
use futures::{future, Future};
use native_contracts::ServiceTransactionChecker as Contract;
use bigint::prelude::U256;
use ethereum_types::U256;
use parking_lot::Mutex;
const SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME: &'static str = "service_transaction_checker";

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