diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 56f2e4f4f8..ec3f404100 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -553,39 +553,6 @@ dependencies = [ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ethbloom" -version = "0.5.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-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethereum-types" -version = "0.4.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)", - "ethbloom 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", - "uint 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethereum-types-serialize" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "etrace" version = "0.2.8" @@ -1754,7 +1721,6 @@ dependencies = [ "node-primitives 0.1.0", "node-runtime 0.1.0", "parity-codec 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 0.1.0", "substrate-client 0.1.0", "substrate-keyring 0.1.0", @@ -2227,17 +2193,6 @@ dependencies = [ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rlp" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hex 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rust-crypto" version = "0.2.36" @@ -2534,7 +2489,6 @@ dependencies = [ "assert_matches 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0", "sr-std 0.1.0", "substrate-primitives 0.1.0", "wabt 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2622,7 +2576,6 @@ name = "srml-council" version = "0.1.0" dependencies = [ "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)", "parity-codec 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2636,7 +2589,6 @@ dependencies = [ "srml-democracy 0.1.0", "srml-support 0.1.0", "srml-system 0.1.0", - "substrate-keyring 0.1.0", "substrate-primitives 0.1.0", ] @@ -2713,7 +2665,6 @@ dependencies = [ "srml-support 0.1.0", "srml-system 0.1.0", "srml-timestamp 0.1.0", - "substrate-keyring 0.1.0", "substrate-primitives 0.1.0", ] @@ -2729,7 +2680,6 @@ dependencies = [ "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 0.1.0", "sr-primitives 0.1.0", - "sr-sandbox 0.1.0", "sr-std 0.1.0", "srml-balances 0.1.0", "srml-consensus 0.1.0", @@ -2755,7 +2705,6 @@ dependencies = [ "sr-io 0.1.0", "sr-std 0.1.0", "substrate-metadata 0.1.0", - "substrate-primitives 0.1.0", ] [[package]] @@ -2914,12 +2863,9 @@ dependencies = [ "kvdb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-memorydb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.9.0 (git+https://github.com/paritytech/trie)", "parity-codec 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "slog 2.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0", "sr-primitives 0.1.0", "substrate-bft 0.1.0", "substrate-executor 0.1.0", @@ -2929,8 +2875,6 @@ dependencies = [ "substrate-telemetry 0.3.0", "substrate-test-client 0.1.0", "substrate-trie 0.4.0", - "trie-db 0.9.0 (git+https://github.com/paritytech/trie)", - "trie-root 0.9.0 (git+https://github.com/paritytech/trie)", ] [[package]] @@ -2942,7 +2886,6 @@ dependencies = [ "kvdb-memorydb 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb-rocksdb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.9.0 (git+https://github.com/paritytech/trie)", "parity-codec 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2964,7 +2907,6 @@ dependencies = [ "assert_matches 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2978,8 +2920,6 @@ dependencies = [ "substrate-serializer 0.1.0", "substrate-state-machine 0.1.0", "substrate-trie 0.4.0", - "trie-root 0.9.0 (git+https://github.com/paritytech/trie)", - "twox-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "wabt 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "wasmi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3072,10 +3012,8 @@ dependencies = [ "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 0.1.0", "tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-io 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-timer 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "unsigned-varint 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3089,7 +3027,6 @@ dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "hash256-std-hasher 0.9.0 (git+https://github.com/paritytech/trie)", @@ -3099,7 +3036,6 @@ dependencies = [ "parity-codec-derive 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "pretty_assertions 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3130,7 +3066,6 @@ dependencies = [ "substrate-client 0.1.0", "substrate-executor 0.1.0", "substrate-primitives 0.1.0", - "substrate-state-machine 0.1.0", "substrate-test-client 0.1.0", "substrate-transaction-pool 0.1.0", "tokio 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3140,7 +3075,6 @@ dependencies = [ name = "substrate-rpc-servers" version = "0.1.0" dependencies = [ - "jsonrpc-core 8.0.2 (git+https://github.com/paritytech/jsonrpc.git)", "jsonrpc-http-server 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)", "jsonrpc-pubsub 8.0.1 (git+https://github.com/paritytech/jsonrpc.git)", "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git)", @@ -3205,15 +3139,12 @@ dependencies = [ name = "substrate-state-machine" version = "0.1.0" dependencies = [ - "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.9.0 (git+https://github.com/paritytech/trie)", "parity-codec 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 0.1.0", "substrate-trie 0.4.0", "trie-db 0.9.0 (git+https://github.com/paritytech/trie)", @@ -3238,11 +3169,9 @@ dependencies = [ name = "substrate-test-client" version = "0.1.0" dependencies = [ - "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "parity-codec 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "rhododendron 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "sr-primitives 0.1.0", - "srml-support 0.1.0", "substrate-bft 0.1.0", "substrate-client 0.1.0", "substrate-executor 0.1.0", @@ -3795,7 +3724,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.3 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4158,9 +4086,6 @@ dependencies = [ "checksum environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db746025e3ea695bfa0ae744dbacd5fcfc8db51b9760cf8bd0ab69708bb93c49" "checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02" "checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = "" -"checksum ethbloom 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a93a43ce2e9f09071449da36bfa7a1b20b950ee344b6904ff23de493b03b386" -"checksum ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35b3c5a18bc5e73a32a110ac743ec04b02bbbcd3b71d3118d40a6113d509378a" -"checksum ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ac59a21a9ce98e188f3dace9eb67a6c4a3c67ec7fbc7218cb827852679dc002" "checksum etrace 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "5a3eb49b4ae7e88cc23caa812e8072c9f83a3e202e0b789ff4f9319cf796d8ca" "checksum exit-future 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9aa7b56cef68c4182db7212dece19cc9f6e2916cf9412e57e6cea53ec02f316d" "checksum failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7efb22686e4a466b1ec1a15c2898f91fa9cb340452496dca654032de20ff95b9" @@ -4315,7 +4240,6 @@ dependencies = [ "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" "checksum rhododendron 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e20523445e693f394c0e487113ae656071311c9ee4c1e914441bece8c929b21d" "checksum ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6f7d28b30a72c01b458428e0ae988d4149c20d902346902be881e3edc4bb325c" -"checksum rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "524c5ad554859785dfc8469df3ed5e0b5784d4d335877ed47c8d90fc0eb238fe" "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" "checksum rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "76d7ba1feafada44f2d38eed812bd2489a03c0f5abb975799251518b68848649" "checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e" diff --git a/substrate/ci/script.sh b/substrate/ci/script.sh index 7eee447bb0..cc74d269d0 100755 --- a/substrate/ci/script.sh +++ b/substrate/ci/script.sh @@ -2,6 +2,9 @@ set -eux +# Enable warnings about unused extern crates +export RUSTFLAGS=" -W unused-extern-crates" + # Install rustup and the specified rust toolchain. curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=$RUST_TOOLCHAIN -y diff --git a/substrate/core/client/Cargo.toml b/substrate/core/client/Cargo.toml index 339f1c6b3d..318ce5faf5 100644 --- a/substrate/core/client/Cargo.toml +++ b/substrate/core/client/Cargo.toml @@ -8,7 +8,6 @@ error-chain = "0.12" fnv = "1.0" log = "0.4" parking_lot = "0.4" -trie-root = { git = "https://github.com/paritytech/trie" } hex-literal = "0.1" futures = "0.1.17" slog = "^2" @@ -17,17 +16,13 @@ substrate-bft = { path = "../bft" } parity-codec = "2.0" substrate-executor = { path = "../executor" } substrate-primitives = { path = "../primitives" } -sr-io = { path = "../sr-io" } sr-primitives = { path = "../sr-primitives" } substrate-state-machine = { path = "../state-machine" } substrate-keyring = { path = "../keyring" } substrate-trie = { path = "../trie" } substrate-telemetry = { path = "../telemetry" } hash-db = { git = "https://github.com/paritytech/trie" } -trie-db = { git = "https://github.com/paritytech/trie" } -rlp = "0.2.4" kvdb = "0.1" -memory-db = { git = "https://github.com/paritytech/trie" } [dev-dependencies] substrate-test-client = { path = "../test-client" } diff --git a/substrate/core/client/db/Cargo.toml b/substrate/core/client/db/Cargo.toml index 45af95f51a..0d91dd184b 100644 --- a/substrate/core/client/db/Cargo.toml +++ b/substrate/core/client/db/Cargo.toml @@ -9,7 +9,6 @@ log = "0.4" kvdb = "0.1" kvdb-rocksdb = "0.1.3" hash-db = { git = "https://github.com/paritytech/trie" } -memory-db = { git = "https://github.com/paritytech/trie" } substrate-primitives = { path = "../../primitives" } sr-primitives = { path = "../../sr-primitives" } substrate-client = { path = "../../client" } diff --git a/substrate/core/client/db/src/lib.rs b/substrate/core/client/db/src/lib.rs index c261f667e1..afa28efeb3 100644 --- a/substrate/core/client/db/src/lib.rs +++ b/substrate/core/client/db/src/lib.rs @@ -31,7 +31,6 @@ extern crate substrate_client as client; extern crate kvdb_rocksdb; extern crate kvdb; extern crate hash_db; -extern crate memory_db; extern crate parking_lot; extern crate substrate_state_machine as state_machine; extern crate substrate_primitives as primitives; diff --git a/substrate/core/client/src/lib.rs b/substrate/core/client/src/lib.rs index ca35a03974..3a79892b97 100644 --- a/substrate/core/client/src/lib.rs +++ b/substrate/core/client/src/lib.rs @@ -23,7 +23,6 @@ extern crate substrate_bft as bft; extern crate substrate_trie as trie; extern crate parity_codec as codec; extern crate substrate_primitives as primitives; -extern crate sr_io as runtime_io; extern crate sr_primitives as runtime_primitives; extern crate substrate_state_machine as state_machine; #[cfg(test)] extern crate substrate_keyring as keyring; @@ -34,12 +33,8 @@ extern crate substrate_state_machine as state_machine; extern crate fnv; extern crate futures; extern crate parking_lot; -extern crate trie_root; -extern crate trie_db; extern crate hash_db; -extern crate rlp; extern crate heapsize; -extern crate memory_db; extern crate kvdb; #[macro_use] extern crate error_chain; diff --git a/substrate/core/executor/Cargo.toml b/substrate/core/executor/Cargo.toml index 5b782115cf..2531a7b991 100644 --- a/substrate/core/executor/Cargo.toml +++ b/substrate/core/executor/Cargo.toml @@ -16,12 +16,9 @@ serde = "1.0" serde_derive = "1.0" wasmi = "0.4" byteorder = "1.1" -trie-root = { git = "https://github.com/paritytech/trie" } -twox-hash = "1.1.0" lazy_static = "1.0" parking_lot = "*" log = "0.4" -hash-db = { git = "https://github.com/paritytech/trie" } [dev-dependencies] assert_matches = "1.1" diff --git a/substrate/core/executor/src/lib.rs b/substrate/core/executor/src/lib.rs index 67e676abb8..67b81f5210 100644 --- a/substrate/core/executor/src/lib.rs +++ b/substrate/core/executor/src/lib.rs @@ -38,13 +38,9 @@ extern crate substrate_state_machine as state_machine; extern crate sr_version as runtime_version; extern crate substrate_trie as trie; -extern crate serde; extern crate wasmi; extern crate byteorder; -extern crate trie_root; extern crate parking_lot; -extern crate twox_hash; -extern crate hash_db; #[macro_use] extern crate log; diff --git a/substrate/core/executor/wasm/Cargo.lock b/substrate/core/executor/wasm/Cargo.lock index 2d3eed6bbd..95cd7bf2ff 100644 --- a/substrate/core/executor/wasm/Cargo.lock +++ b/substrate/core/executor/wasm/Cargo.lock @@ -130,7 +130,6 @@ version = "0.1.0" dependencies = [ "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0", "sr-std 0.1.0", "substrate-primitives 0.1.0", ] diff --git a/substrate/core/keystore/src/lib.rs b/substrate/core/keystore/src/lib.rs index f3eeb4be3f..aeb9c50886 100644 --- a/substrate/core/keystore/src/lib.rs +++ b/substrate/core/keystore/src/lib.rs @@ -23,7 +23,6 @@ extern crate parity_crypto as crypto; extern crate subtle; extern crate rand; extern crate serde_json; -extern crate serde; extern crate hex; #[macro_use] diff --git a/substrate/core/network-libp2p/Cargo.toml b/substrate/core/network-libp2p/Cargo.toml index 8644499467..bcd5facdf7 100644 --- a/substrate/core/network-libp2p/Cargo.toml +++ b/substrate/core/network-libp2p/Cargo.toml @@ -19,9 +19,7 @@ rand = "0.5.0" serde = "1.0.70" serde_derive = "1.0.70" serde_json = "1.0.24" -smallvec = "0.6.5" tokio = "0.1" -tokio-executor = "0.1" tokio-io = "0.1" tokio-timer = "0.2" unsigned-varint = { version = "0.2.1", features = ["codec"] } diff --git a/substrate/core/network-libp2p/src/lib.rs b/substrate/core/network-libp2p/src/lib.rs index c823c0e66b..2122d92a74 100644 --- a/substrate/core/network-libp2p/src/lib.rs +++ b/substrate/core/network-libp2p/src/lib.rs @@ -25,19 +25,16 @@ extern crate parking_lot; extern crate fnv; extern crate futures; extern crate tokio; -extern crate tokio_executor; extern crate tokio_io; extern crate tokio_timer; extern crate libc; #[macro_use] extern crate libp2p; extern crate rand; -extern crate serde; #[macro_use] extern crate serde_derive; extern crate serde_json; extern crate substrate_primitives as primitives; -extern crate smallvec; extern crate bytes; extern crate unsigned_varint; diff --git a/substrate/core/primitives/Cargo.toml b/substrate/core/primitives/Cargo.toml index 83a2e2c1e6..e864f41397 100644 --- a/substrate/core/primitives/Cargo.toml +++ b/substrate/core/primitives/Cargo.toml @@ -8,13 +8,11 @@ crunchy = "0.1" sr-std = { path = "../sr-std", default-features = false } parity-codec = { version = "2.0", default-features = false } parity-codec-derive = { version = "2.0", default-features = false } -elastic-array = {version = "0.10", optional = true } fixed-hash = { version = "0.2.2", default-features = false } rustc-hex = { version = "2.0", default-features = false } serde = { version = "1.0", default-features = false } serde_derive = { version = "1.0", optional = true } uint = { version = "0.4.1", default-features = false } -rlp = { version = "0.2.4", optional = true } twox-hash = { version = "1.1.0", optional = true } byteorder = { version = "1.1", default-features = false } wasmi = { version = "0.4", optional = true } @@ -53,5 +51,4 @@ std = [ "base58", "serde_derive", "byteorder/std", - "elastic-array", ] diff --git a/substrate/core/primitives/src/lib.rs b/substrate/core/primitives/src/lib.rs index 9b5750e3c5..7aa1442f34 100644 --- a/substrate/core/primitives/src/lib.rs +++ b/substrate/core/primitives/src/lib.rs @@ -62,8 +62,6 @@ extern crate core; extern crate wasmi; extern crate hash_db; extern crate hash256_std_hasher; -#[cfg(feature = "std")] -extern crate elastic_array; extern crate sr_std as rstd; diff --git a/substrate/core/rpc-servers/Cargo.toml b/substrate/core/rpc-servers/Cargo.toml index 0d6ff33511..f3c0ae9906 100644 --- a/substrate/core/rpc-servers/Cargo.toml +++ b/substrate/core/rpc-servers/Cargo.toml @@ -4,7 +4,6 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git" } jsonrpc-http-server = { git = "https://github.com/paritytech/jsonrpc.git" } jsonrpc-pubsub = { git = "https://github.com/paritytech/jsonrpc.git" } jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git" } diff --git a/substrate/core/rpc-servers/src/lib.rs b/substrate/core/rpc-servers/src/lib.rs index 8d9620535c..fb989740d1 100644 --- a/substrate/core/rpc-servers/src/lib.rs +++ b/substrate/core/rpc-servers/src/lib.rs @@ -22,7 +22,6 @@ pub extern crate substrate_rpc as apis; -extern crate jsonrpc_core as rpc; extern crate jsonrpc_http_server as http; extern crate jsonrpc_pubsub as pubsub; extern crate jsonrpc_ws_server as ws; diff --git a/substrate/core/rpc/Cargo.toml b/substrate/core/rpc/Cargo.toml index cdb080adc6..10c91cc8b8 100644 --- a/substrate/core/rpc/Cargo.toml +++ b/substrate/core/rpc/Cargo.toml @@ -17,7 +17,6 @@ substrate-transaction-pool = { path = "../transaction-pool" } substrate-primitives = { path = "../primitives" } sr-primitives = { path = "../sr-primitives" } sr-version = { path = "../sr-version" } -substrate-state-machine = { path = "../state-machine" } tokio = "0.1.7" serde_json = "1.0" diff --git a/substrate/core/rpc/src/lib.rs b/substrate/core/rpc/src/lib.rs index b9254cc1a7..882a341c60 100644 --- a/substrate/core/rpc/src/lib.rs +++ b/substrate/core/rpc/src/lib.rs @@ -28,7 +28,6 @@ extern crate substrate_client as client; extern crate substrate_transaction_pool as transaction_pool; extern crate substrate_primitives as primitives; extern crate sr_primitives as runtime_primitives; -extern crate substrate_state_machine as state_machine; extern crate sr_version as runtime_version; extern crate tokio; extern crate serde_json; diff --git a/substrate/core/sr-sandbox/Cargo.toml b/substrate/core/sr-sandbox/Cargo.toml index f1fa427188..7e6d4ce87a 100755 --- a/substrate/core/sr-sandbox/Cargo.toml +++ b/substrate/core/sr-sandbox/Cargo.toml @@ -11,7 +11,6 @@ rustc_version = "0.2" wasmi = { version = "0.4", optional = true } substrate-primitives = { path = "../primitives", default-features = false } sr-std = { path = "../sr-std", default-features = false } -sr-io = { path = "../sr-io", default-features = false } parity-codec = { version = "2.0", default-features = false } [dev-dependencies] @@ -25,7 +24,6 @@ std = [ "substrate-primitives/std", "sr-std/std", "parity-codec/std", - "sr-io/std", ] nightly = [] strict = [] diff --git a/substrate/core/sr-sandbox/src/lib.rs b/substrate/core/sr-sandbox/src/lib.rs index 49d18c13c9..caaba845dd 100755 --- a/substrate/core/sr-sandbox/src/lib.rs +++ b/substrate/core/sr-sandbox/src/lib.rs @@ -43,11 +43,11 @@ #![cfg_attr(not(feature = "std"), feature(core_intrinsics))] #![cfg_attr(not(feature = "std"), feature(alloc))] -extern crate parity_codec as codec; -extern crate sr_io as runtime_io; #[cfg_attr(not(feature = "std"), macro_use)] extern crate sr_std as rstd; extern crate substrate_primitives as primitives; +#[cfg(not(feature = "std"))] +extern crate parity_codec as codec; #[cfg(test)] extern crate wabt; diff --git a/substrate/core/sr-version/src/lib.rs b/substrate/core/sr-version/src/lib.rs index 0459ac7710..7b7ec307a4 100644 --- a/substrate/core/sr-version/src/lib.rs +++ b/substrate/core/sr-version/src/lib.rs @@ -18,9 +18,6 @@ #![cfg_attr(not(feature = "std"), no_std)] -#[cfg(feature = "std")] -extern crate serde; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; @@ -32,8 +29,6 @@ extern crate sr_std as rstd; #[macro_use] extern crate parity_codec_derive; -extern crate parity_codec as codec; - #[cfg(feature = "std")] use std::fmt; #[cfg(feature = "std")] diff --git a/substrate/core/state-db/src/lib.rs b/substrate/core/state-db/src/lib.rs index f0c031d960..0f5a4eb6a2 100644 --- a/substrate/core/state-db/src/lib.rs +++ b/substrate/core/state-db/src/lib.rs @@ -36,6 +36,7 @@ #[macro_use] extern crate parity_codec_derive; extern crate parking_lot; extern crate parity_codec as codec; +#[cfg(test)] extern crate substrate_primitives as primitives; mod noncanonical; diff --git a/substrate/core/state-machine/Cargo.toml b/substrate/core/state-machine/Cargo.toml index 35c1788ca0..b5bdd761eb 100644 --- a/substrate/core/state-machine/Cargo.toml +++ b/substrate/core/state-machine/Cargo.toml @@ -5,16 +5,13 @@ authors = ["Parity Technologies "] description = "Substrate State Machine" [dependencies] -byteorder = "1.1" hex-literal = "0.1.0" log = "0.4" parking_lot = "0.4" heapsize = "0.4" hash-db = { git = "https://github.com/paritytech/trie" } -memory-db = { git = "https://github.com/paritytech/trie" } trie-db = { git = "https://github.com/paritytech/trie" } trie-root = { git = "https://github.com/paritytech/trie" } -rlp = "0.2.4" substrate-trie = { path = "../trie" } substrate-primitives = { path = "../primitives" } parity-codec = "2.0" \ No newline at end of file diff --git a/substrate/core/state-machine/src/lib.rs b/substrate/core/state-machine/src/lib.rs index 8badde005b..b158966826 100644 --- a/substrate/core/state-machine/src/lib.rs +++ b/substrate/core/state-machine/src/lib.rs @@ -20,19 +20,17 @@ #![warn(missing_docs)] -#[cfg_attr(test, macro_use)] +#[cfg(test)] +#[macro_use] extern crate hex_literal; #[macro_use] extern crate log; extern crate hash_db; -extern crate memory_db; extern crate substrate_trie; -extern crate byteorder; extern crate parking_lot; -extern crate rlp; extern crate heapsize; extern crate substrate_primitives as primitives; extern crate parity_codec as codec; diff --git a/substrate/core/test-client/Cargo.toml b/substrate/core/test-client/Cargo.toml index 92fadf5897..f4ea085eff 100644 --- a/substrate/core/test-client/Cargo.toml +++ b/substrate/core/test-client/Cargo.toml @@ -11,8 +11,6 @@ parity-codec = "2.0" substrate-executor = { path = "../executor" } substrate-keyring = { path = "../../core/keyring" } substrate-primitives = { path = "../primitives" } -srml-support = { path = "../../srml/support" } substrate-test-runtime = { path = "../test-runtime" } sr-primitives = { path = "../sr-primitives" } -hash-db = { git = "https://github.com/paritytech/trie" } diff --git a/substrate/core/test-client/src/lib.rs b/substrate/core/test-client/src/lib.rs index 20e33af01d..b32c79cae8 100644 --- a/substrate/core/test-client/src/lib.rs +++ b/substrate/core/test-client/src/lib.rs @@ -24,10 +24,8 @@ extern crate rhododendron; extern crate substrate_bft as bft; extern crate parity_codec as codec; extern crate substrate_primitives as primitives; -extern crate srml_support as runtime_support; extern crate sr_primitives as runtime_primitives; #[macro_use] extern crate substrate_executor as executor; -extern crate hash_db; pub extern crate substrate_client as client; pub extern crate substrate_keyring as keyring; diff --git a/substrate/core/test-runtime/src/lib.rs b/substrate/core/test-runtime/src/lib.rs index dacf4be8e7..16b0b27b07 100644 --- a/substrate/core/test-runtime/src/lib.rs +++ b/substrate/core/test-runtime/src/lib.rs @@ -24,9 +24,6 @@ extern crate sr_std as rstd; extern crate parity_codec as codec; extern crate sr_primitives as runtime_primitives; -#[cfg(feature = "std")] -extern crate serde; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; diff --git a/substrate/core/test-runtime/wasm/Cargo.lock b/substrate/core/test-runtime/wasm/Cargo.lock index 28ffa26cc8..441302233c 100644 --- a/substrate/core/test-runtime/wasm/Cargo.lock +++ b/substrate/core/test-runtime/wasm/Cargo.lock @@ -97,39 +97,6 @@ name = "environmental" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "ethbloom" -version = "0.5.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-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethereum-types" -version = "0.4.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)", - "ethbloom 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", - "uint 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethereum-types-serialize" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "fixed-hash" version = "0.2.2" @@ -438,17 +405,6 @@ dependencies = [ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rlp" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rustc-hex" version = "1.0.0" @@ -527,7 +483,7 @@ name = "sr-primitives" version = "0.1.0" dependencies = [ "integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -568,7 +524,6 @@ dependencies = [ "sr-io 0.1.0", "sr-std 0.1.0", "substrate-metadata 0.1.0", - "substrate-primitives 0.1.0", ] [[package]] @@ -594,7 +549,6 @@ dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "hash256-std-hasher 0.9.0 (git+https://github.com/paritytech/trie)", @@ -616,15 +570,12 @@ dependencies = [ name = "substrate-state-machine" version = "0.1.0" dependencies = [ - "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.9.0 (git+https://github.com/paritytech/trie)", + "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 0.1.0", "substrate-trie 0.4.0", "trie-db 0.9.0 (git+https://github.com/paritytech/trie)", @@ -636,7 +587,7 @@ name = "substrate-test-runtime" version = "0.1.0" dependencies = [ "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 0.1.0", @@ -678,14 +629,6 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "tiny-keccak" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "trie-db" version = "0.9.0" @@ -720,7 +663,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.6 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -797,9 +739,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda" "checksum elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88d4851b005ef16de812ea9acdb7bece2f0a40dd86c07b85631d7dafa54537bb" "checksum environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db746025e3ea695bfa0ae744dbacd5fcfc8db51b9760cf8bd0ab69708bb93c49" -"checksum ethbloom 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a93a43ce2e9f09071449da36bfa7a1b20b950ee344b6904ff23de493b03b386" -"checksum ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35b3c5a18bc5e73a32a110ac743ec04b02bbbcd3b71d3118d40a6113d509378a" -"checksum ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ac59a21a9ce98e188f3dace9eb67a6c4a3c67ec7fbc7218cb827852679dc002" "checksum fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d5ec8112f00ea8a483e04748a85522184418fd1cf02890b626d8fc28683f7de" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" @@ -840,7 +779,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b614fe08b6665cb9a231d07ac1364b0ef3cb3698f1239ee0c4c3a88a524f54c8" "checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" "checksum ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6f7d28b30a72c01b458428e0ae988d4149c20d902346902be881e3edc4bb325c" -"checksum rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "524c5ad554859785dfc8469df3ed5e0b5784d4d335877ed47c8d90fc0eb238fe" "checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e" "checksum rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "403bb3a286107a04825a5f82e1270acc1e14028d3d554d7a1e08914549575ab8" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" @@ -853,7 +791,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741" "checksum syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)" = "854b08a640fc8f54728fb95321e3ec485b365a97fe47609797c671addd1dde69" -"checksum tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e9175261fbdb60781fcd388a4d6cc7e14764a2b629a7ad94abb439aed223a44f" "checksum trie-db 0.9.0 (git+https://github.com/paritytech/trie)" = "" "checksum trie-root 0.9.0 (git+https://github.com/paritytech/trie)" = "" "checksum twox-hash 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4f85be565a110ed72ed7048cf56570db04ce0a592c98aa59b7dacde3e5718750" diff --git a/substrate/node/executor/src/lib.rs b/substrate/node/executor/src/lib.rs index 6f4a0b1b9c..5fbf9ff7fc 100644 --- a/substrate/node/executor/src/lib.rs +++ b/substrate/node/executor/src/lib.rs @@ -19,12 +19,7 @@ extern crate node_runtime; #[macro_use] extern crate substrate_executor; -extern crate parity_codec as codec; -extern crate substrate_state_machine as state_machine; -extern crate sr_io as runtime_io; extern crate substrate_primitives as primitives; -extern crate node_primitives; -extern crate substrate_trie as trie; #[cfg(test)] extern crate substrate_keyring as keyring; #[cfg(test)] extern crate sr_primitives as runtime_primitives; @@ -36,6 +31,11 @@ extern crate substrate_trie as trie; #[cfg(test)] extern crate srml_consensus as consensus; #[cfg(test)] extern crate srml_timestamp as timestamp; #[cfg(test)] extern crate srml_treasury as treasury; +#[cfg(test)] extern crate node_primitives; +#[cfg(test)] extern crate parity_codec as codec; +#[cfg(test)] extern crate sr_io as runtime_io; +#[cfg(test)] extern crate substrate_trie as trie; +#[cfg(test)] extern crate substrate_state_machine as state_machine; #[cfg(test)] #[macro_use] extern crate hex_literal; pub use substrate_executor::NativeExecutor; diff --git a/substrate/node/primitives/src/lib.rs b/substrate/node/primitives/src/lib.rs index 93733bc91e..4bd4d4774f 100644 --- a/substrate/node/primitives/src/lib.rs +++ b/substrate/node/primitives/src/lib.rs @@ -21,9 +21,6 @@ #![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), feature(alloc))] -#[cfg(feature = "std")] -extern crate serde; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; @@ -34,7 +31,6 @@ extern crate parity_codec_derive; extern crate sr_std as rstd; extern crate sr_primitives as runtime_primitives; extern crate substrate_primitives as primitives; -extern crate parity_codec as codec; use rstd::prelude::*; use runtime_primitives::generic; diff --git a/substrate/node/runtime/src/lib.rs b/substrate/node/runtime/src/lib.rs index 3898de19a5..a1f11551b4 100644 --- a/substrate/node/runtime/src/lib.rs +++ b/substrate/node/runtime/src/lib.rs @@ -33,10 +33,6 @@ extern crate sr_primitives as runtime_primitives; #[macro_use] extern crate serde_derive; -#[cfg(feature = "std")] -extern crate serde; - -extern crate parity_codec as codec; extern crate substrate_primitives; #[macro_use] diff --git a/substrate/node/runtime/wasm/Cargo.lock b/substrate/node/runtime/wasm/Cargo.lock index 5558ed5480..2bdc3c9a12 100644 --- a/substrate/node/runtime/wasm/Cargo.lock +++ b/substrate/node/runtime/wasm/Cargo.lock @@ -97,39 +97,6 @@ name = "environmental" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "ethbloom" -version = "0.5.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-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", - "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethereum-types" -version = "0.4.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)", - "ethbloom 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", - "uint 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethereum-types-serialize" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "fixed-hash" version = "0.2.2" @@ -489,17 +456,6 @@ dependencies = [ "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rlp" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "rustc-hex" version = "1.0.0" @@ -586,7 +542,7 @@ name = "sr-primitives" version = "0.1.0" dependencies = [ "integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -603,7 +559,6 @@ version = "0.1.0" dependencies = [ "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "sr-io 0.1.0", "sr-std 0.1.0", "substrate-primitives 0.1.0", "wasmi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -688,7 +643,6 @@ name = "srml-council" version = "0.1.0" dependencies = [ "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "integer-sqrt 0.1.0 (git+https://github.com/paritytech/integer-sqrt-rs.git)", "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec-derive 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -702,7 +656,6 @@ dependencies = [ "srml-democracy 0.1.0", "srml-support 0.1.0", "srml-system 0.1.0", - "substrate-keyring 0.1.0", "substrate-primitives 0.1.0", ] @@ -759,7 +712,6 @@ dependencies = [ "srml-support 0.1.0", "srml-system 0.1.0", "srml-timestamp 0.1.0", - "substrate-keyring 0.1.0", "substrate-primitives 0.1.0", ] @@ -775,7 +727,6 @@ dependencies = [ "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)", "sr-io 0.1.0", "sr-primitives 0.1.0", - "sr-sandbox 0.1.0", "sr-std 0.1.0", "srml-balances 0.1.0", "srml-consensus 0.1.0", @@ -799,7 +750,6 @@ dependencies = [ "sr-io 0.1.0", "sr-std 0.1.0", "substrate-metadata 0.1.0", - "substrate-primitives 0.1.0", ] [[package]] @@ -886,7 +836,6 @@ dependencies = [ "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "hash256-std-hasher 0.9.0 (git+https://github.com/paritytech/trie)", @@ -908,15 +857,12 @@ dependencies = [ name = "substrate-state-machine" version = "0.1.0" dependencies = [ - "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "hash-db 0.9.0 (git+https://github.com/paritytech/trie)", "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "hex-literal 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memory-db 0.9.0 (git+https://github.com/paritytech/trie)", + "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "parity-codec 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "substrate-primitives 0.1.0", "substrate-trie 0.4.0", "trie-db 0.9.0 (git+https://github.com/paritytech/trie)", @@ -954,14 +900,6 @@ dependencies = [ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "tiny-keccak" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "trie-db" version = "0.9.0" @@ -996,7 +934,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.2.6 (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.2 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1073,9 +1010,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum crunchy 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a2f4a431c5c9f662e1200b7c7f02c34e91361150e382089a8f2dec3ba680cbda" "checksum elastic-array 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88d4851b005ef16de812ea9acdb7bece2f0a40dd86c07b85631d7dafa54537bb" "checksum environmental 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db746025e3ea695bfa0ae744dbacd5fcfc8db51b9760cf8bd0ab69708bb93c49" -"checksum ethbloom 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a93a43ce2e9f09071449da36bfa7a1b20b950ee344b6904ff23de493b03b386" -"checksum ethereum-types 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35b3c5a18bc5e73a32a110ac743ec04b02bbbcd3b71d3118d40a6113d509378a" -"checksum ethereum-types-serialize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ac59a21a9ce98e188f3dace9eb67a6c4a3c67ec7fbc7218cb827852679dc002" "checksum fixed-hash 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d5ec8112f00ea8a483e04748a85522184418fd1cf02890b626d8fc28683f7de" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" @@ -1117,7 +1051,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b614fe08b6665cb9a231d07ac1364b0ef3cb3698f1239ee0c4c3a88a524f54c8" "checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356" "checksum ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6f7d28b30a72c01b458428e0ae988d4149c20d902346902be881e3edc4bb325c" -"checksum rlp 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "524c5ad554859785dfc8469df3ed5e0b5784d4d335877ed47c8d90fc0eb238fe" "checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e" "checksum rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "403bb3a286107a04825a5f82e1270acc1e14028d3d554d7a1e08914549575ab8" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" @@ -1131,7 +1064,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)" = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741" "checksum syn 0.15.6 (registry+https://github.com/rust-lang/crates.io-index)" = "854b08a640fc8f54728fb95321e3ec485b365a97fe47609797c671addd1dde69" -"checksum tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e9175261fbdb60781fcd388a4d6cc7e14764a2b629a7ad94abb439aed223a44f" "checksum trie-db 0.9.0 (git+https://github.com/paritytech/trie)" = "" "checksum trie-root 0.9.0 (git+https://github.com/paritytech/trie)" = "" "checksum twox-hash 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4f85be565a110ed72ed7048cf56570db04ce0a592c98aa59b7dacde3e5718750" diff --git a/substrate/node/transaction-pool/Cargo.toml b/substrate/node/transaction-pool/Cargo.toml index d70d3255a3..afe516b815 100644 --- a/substrate/node/transaction-pool/Cargo.toml +++ b/substrate/node/transaction-pool/Cargo.toml @@ -6,7 +6,6 @@ authors = ["Parity Technologies "] [dependencies] log = "0.4" error-chain = "0.12" -parking_lot = "0.4" node-primitives = { path = "../primitives" } node-runtime = { path = "../runtime" } substrate-client = { path = "../../core/client" } diff --git a/substrate/node/transaction-pool/src/lib.rs b/substrate/node/transaction-pool/src/lib.rs index 931b239c49..b1732d60a2 100644 --- a/substrate/node/transaction-pool/src/lib.rs +++ b/substrate/node/transaction-pool/src/lib.rs @@ -21,7 +21,6 @@ extern crate substrate_primitives; extern crate sr_primitives; extern crate node_runtime as runtime; extern crate node_primitives as primitives; -extern crate parking_lot; #[cfg(test)] extern crate substrate_keyring; diff --git a/substrate/srml/balances/src/lib.rs b/substrate/srml/balances/src/lib.rs index 3cd0aa94e4..2f011ef270 100644 --- a/substrate/srml/balances/src/lib.rs +++ b/substrate/srml/balances/src/lib.rs @@ -18,9 +18,6 @@ #![cfg_attr(not(feature = "std"), no_std)] -#[cfg(feature = "std")] -extern crate serde; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; @@ -35,11 +32,14 @@ extern crate sr_std as rstd; extern crate parity_codec_derive; extern crate parity_codec as codec; -extern crate substrate_primitives; -extern crate sr_io as runtime_io; extern crate sr_primitives as primitives; extern crate srml_system as system; +#[cfg(test)] +extern crate sr_io as runtime_io; +#[cfg(test)] +extern crate substrate_primitives; + use rstd::prelude::*; use rstd::{cmp, result}; use codec::{Encode, Decode, Codec, Input, Output}; diff --git a/substrate/srml/consensus/src/lib.rs b/substrate/srml/consensus/src/lib.rs index 241f78ce19..0d3e84bcf1 100644 --- a/substrate/srml/consensus/src/lib.rs +++ b/substrate/srml/consensus/src/lib.rs @@ -25,9 +25,6 @@ extern crate sr_std as rstd; #[macro_use] extern crate srml_support as runtime_support; -#[cfg(feature = "std")] -extern crate serde; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; @@ -35,12 +32,14 @@ extern crate serde_derive; #[macro_use] extern crate parity_codec_derive; -extern crate sr_io as runtime_io; extern crate sr_primitives as primitives; extern crate parity_codec as codec; extern crate srml_system as system; extern crate substrate_primitives; +#[cfg(test)] +extern crate sr_io as runtime_io; + use rstd::prelude::*; use runtime_support::{storage, Parameter}; use runtime_support::dispatch::Result; diff --git a/substrate/srml/contract/src/lib.rs b/substrate/srml/contract/src/lib.rs index 43653bd26d..1a048bfd5b 100644 --- a/substrate/srml/contract/src/lib.rs +++ b/substrate/srml/contract/src/lib.rs @@ -56,9 +56,6 @@ #[macro_use] extern crate serde_derive; -#[cfg(feature = "std")] -extern crate serde; - #[macro_use] extern crate parity_codec_derive; @@ -79,6 +76,8 @@ extern crate srml_system as system; extern crate srml_support as runtime_support; extern crate sr_primitives as runtime_primitives; + +#[cfg(test)] extern crate substrate_primitives; #[cfg(test)] diff --git a/substrate/srml/council/Cargo.toml b/substrate/srml/council/Cargo.toml index 0d0380daaf..0127175097 100644 --- a/substrate/srml/council/Cargo.toml +++ b/substrate/srml/council/Cargo.toml @@ -5,13 +5,11 @@ authors = ["Parity Technologies "] [dependencies] hex-literal = "0.1.0" -integer-sqrt = { git = "https://github.com/paritytech/integer-sqrt-rs.git", branch = "master" } serde = { version = "1.0", default-features = false } serde_derive = { version = "1.0", optional = true } safe-mix = { version = "1.0", default-features = false} parity-codec = { version = "2.0", default-features = false } parity-codec-derive = { version = "2.0", default-features = false } -substrate-keyring = { path = "../../core/keyring", optional = true } substrate-primitives = { path = "../../core/primitives", default-features = false } sr-std = { path = "../../core/sr-std", default-features = false } sr-io = { path = "../../core/sr-io", default-features = false } @@ -28,7 +26,6 @@ std = [ "serde/std", "serde_derive", "safe-mix/std", - "substrate-keyring", "parity-codec/std", "parity-codec-derive/std", "substrate-primitives/std", diff --git a/substrate/srml/council/src/lib.rs b/substrate/srml/council/src/lib.rs index 1491b83d03..8793186827 100644 --- a/substrate/srml/council/src/lib.rs +++ b/substrate/srml/council/src/lib.rs @@ -29,11 +29,9 @@ extern crate serde_derive; #[macro_use] extern crate hex_literal; -extern crate integer_sqrt; extern crate parity_codec as codec; #[macro_use] extern crate parity_codec_derive; extern crate substrate_primitives; -#[cfg(feature = "std")] extern crate substrate_keyring as keyring; #[macro_use] extern crate sr_std as rstd; extern crate sr_io as runtime_io; #[macro_use] extern crate srml_support; diff --git a/substrate/srml/democracy/src/lib.rs b/substrate/srml/democracy/src/lib.rs index 4d84df650e..634fb02251 100644 --- a/substrate/srml/democracy/src/lib.rs +++ b/substrate/srml/democracy/src/lib.rs @@ -18,10 +18,7 @@ #![cfg_attr(not(feature = "std"), no_std)] -#[cfg(feature = "std")] -extern crate serde; - -#[cfg(feature = "std")] +#[cfg(test)] extern crate substrate_primitives; #[cfg(feature = "std")] diff --git a/substrate/srml/executive/src/lib.rs b/substrate/srml/executive/src/lib.rs index 821f2ac43d..07fd67ff24 100644 --- a/substrate/srml/executive/src/lib.rs +++ b/substrate/srml/executive/src/lib.rs @@ -18,8 +18,6 @@ #![cfg_attr(not(feature = "std"), no_std)] -#[cfg(feature = "std")] -extern crate serde; #[cfg(test)] #[macro_use] extern crate serde_derive; diff --git a/substrate/srml/session/Cargo.toml b/substrate/srml/session/Cargo.toml index 65e18c8307..0d57726f96 100644 --- a/substrate/srml/session/Cargo.toml +++ b/substrate/srml/session/Cargo.toml @@ -8,7 +8,6 @@ hex-literal = "0.1.0" serde = { version = "1.0", default-features = false } serde_derive = { version = "1.0", optional = true } safe-mix = { version = "1.0", default-features = false} -substrate-keyring = { path = "../../core/keyring", optional = true } substrate-primitives = { path = "../../core/primitives", default-features = false } parity-codec = { version = "2.0", default-features = false } parity-codec-derive = { version = "2.0", default-features = false } @@ -26,7 +25,6 @@ std = [ "serde/std", "serde_derive", "safe-mix/std", - "substrate-keyring", "parity-codec/std", "parity-codec-derive/std", "substrate-primitives/std", diff --git a/substrate/srml/session/src/lib.rs b/substrate/srml/session/src/lib.rs index d9679ada3c..4e2103a3dc 100644 --- a/substrate/srml/session/src/lib.rs +++ b/substrate/srml/session/src/lib.rs @@ -19,19 +19,10 @@ #![cfg_attr(not(feature = "std"), no_std)] -#[cfg(feature = "std")] -extern crate serde; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; -#[cfg(any(feature = "std", test))] -extern crate substrate_keyring as keyring; - -#[cfg(any(feature = "std", test))] -extern crate substrate_primitives; - #[cfg_attr(feature = "std", macro_use)] extern crate sr_std as rstd; @@ -41,6 +32,9 @@ extern crate srml_support as runtime_support; #[macro_use] extern crate parity_codec_derive; +#[cfg(test)] +extern crate substrate_primitives; +#[cfg(test)] extern crate sr_io as runtime_io; extern crate parity_codec as codec; extern crate sr_primitives as primitives; diff --git a/substrate/srml/staking/Cargo.toml b/substrate/srml/staking/Cargo.toml index ecaa5070f5..3542f7cb70 100644 --- a/substrate/srml/staking/Cargo.toml +++ b/substrate/srml/staking/Cargo.toml @@ -14,7 +14,6 @@ substrate-keyring = { path = "../../core/keyring", optional = true } substrate-primitives = { path = "../../core/primitives", default-features = false } sr-std = { path = "../../core/sr-std", default-features = false } sr-io = { path = "../../core/sr-io", default-features = false } -sr-sandbox = { path = "../../core/sr-sandbox", default-features = false } sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } srml-balances = { path = "../balances", default-features = false } @@ -35,7 +34,6 @@ std = [ "substrate-primitives/std", "sr-std/std", "sr-io/std", - "sr-sandbox/std", "srml-support/std", "sr-primitives/std", "srml-balances/std", diff --git a/substrate/srml/staking/src/lib.rs b/substrate/srml/staking/src/lib.rs index 35b34b77d4..09088dcbdb 100644 --- a/substrate/srml/staking/src/lib.rs +++ b/substrate/srml/staking/src/lib.rs @@ -37,14 +37,17 @@ extern crate sr_std as rstd; extern crate parity_codec_derive; extern crate parity_codec as codec; -extern crate substrate_primitives; -extern crate sr_io as runtime_io; extern crate sr_primitives as primitives; extern crate srml_balances as balances; extern crate srml_consensus as consensus; -extern crate sr_sandbox as sandbox; extern crate srml_session as session; extern crate srml_system as system; + +#[cfg(test)] +extern crate substrate_primitives; +#[cfg(test)] +extern crate sr_io as runtime_io; +#[cfg(test)] extern crate srml_timestamp as timestamp; use rstd::prelude::*; diff --git a/substrate/srml/support/Cargo.toml b/substrate/srml/support/Cargo.toml index ae71ae3396..0bca759ec8 100644 --- a/substrate/srml/support/Cargo.toml +++ b/substrate/srml/support/Cargo.toml @@ -8,7 +8,6 @@ hex-literal = { version = "0.1.0", optional = true } serde = { version = "1.0", default-features = false } serde_derive = { version = "1.0", optional = true } parity-codec = { version = "2.0", default-features = false } -substrate-primitives = { path = "../../core/primitives", default-features = false } substrate-metadata = { path = "../metadata", default-features = false } sr-std = { path = "../../core/sr-std", default-features = false } sr-io = { path = "../../core/sr-io", default-features = false } @@ -24,7 +23,6 @@ std = [ "hex-literal", "serde/std", "serde_derive", - "substrate-primitives/std", "sr-io/std", "parity-codec/std", "sr-std/std", diff --git a/substrate/srml/support/src/lib.rs b/substrate/srml/support/src/lib.rs index 873ca65fc5..16a6ba7344 100644 --- a/substrate/srml/support/src/lib.rs +++ b/substrate/srml/support/src/lib.rs @@ -29,7 +29,6 @@ extern crate serde; extern crate sr_std as rstd; extern crate sr_io as runtime_io; -extern crate substrate_primitives as primitives; extern crate substrate_metadata; extern crate mashup; diff --git a/substrate/srml/system/src/lib.rs b/substrate/srml/system/src/lib.rs index 1867e9eb71..ae1ebd5932 100644 --- a/substrate/srml/system/src/lib.rs +++ b/substrate/srml/system/src/lib.rs @@ -27,9 +27,6 @@ extern crate sr_std as rstd; #[macro_use] extern crate srml_support as runtime_support; -#[cfg(feature = "std")] -extern crate serde; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; diff --git a/substrate/srml/timestamp/src/lib.rs b/substrate/srml/timestamp/src/lib.rs index 244a9b0fa3..142d55ceba 100644 --- a/substrate/srml/timestamp/src/lib.rs +++ b/substrate/srml/timestamp/src/lib.rs @@ -39,15 +39,14 @@ extern crate sr_std as rstd; #[macro_use] extern crate srml_support as runtime_support; -#[cfg(any(feature = "std", test))] -extern crate sr_io as runtime_io; - #[cfg(feature = "std")] #[macro_use] extern crate serde_derive; #[cfg(test)] extern crate substrate_primitives; +#[cfg(test)] +extern crate sr_io as runtime_io; extern crate sr_primitives as runtime_primitives; extern crate srml_system as system; extern crate srml_consensus as consensus; diff --git a/substrate/srml/treasury/src/lib.rs b/substrate/srml/treasury/src/lib.rs index 4668099e16..f2d070e1a5 100644 --- a/substrate/srml/treasury/src/lib.rs +++ b/substrate/srml/treasury/src/lib.rs @@ -24,7 +24,7 @@ extern crate sr_std as rstd; #[macro_use] extern crate srml_support as runtime_support; -#[cfg(feature = "std")] +#[cfg(test)] extern crate sr_io as runtime_io; #[cfg(feature = "std")]