Avoid duplicate depencency declare via package re-export (#1287)

* node/runtime: Avoid duplicate dependency via package reexport

* core/test-runtime: Avoid duplicate dependency via package reexport

* Update lock file
This commit is contained in:
Wei Tang
2018-12-20 00:47:10 +08:00
committed by Gav Wood
parent d5749e878b
commit 66ad1ed974
11 changed files with 117 additions and 107 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ serde_derive = { version = "1.0", optional = true }
parity-codec = { version = "2.1", default-features = false }
parity-codec-derive = { version = "2.1", default-features = false }
substrate-keyring = { path = "../keyring", optional = true }
substrate-client = { path = "../client", optional = true }
substrate-client = { path = "../client", default-features = false }
substrate-primitives = { path = "../primitives", default-features = false }
substrate-consensus-aura-primitives = { path = "../consensus/aura/primitives", default-features = false }
sr-std = { path = "../sr-std", default-features = false }
@@ -27,7 +27,7 @@ std = [
"hex-literal",
"serde",
"serde_derive",
"substrate-client",
"substrate-client/std",
"substrate-keyring",
"parity-codec/std",
"sr-std/std",
+10
View File
@@ -1215,6 +1215,8 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec 2.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"parity-codec-derive 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
"sr-io 0.1.0",
"sr-primitives 0.1.0",
"sr-std 0.1.0",
@@ -1222,9 +1224,17 @@ dependencies = [
"srml-support 0.1.0",
"substrate-client 0.1.0",
"substrate-consensus-aura-primitives 0.1.0",
"substrate-keyring 0.1.0",
"substrate-primitives 0.1.0",
]
[[package]]
name = "substrate-test-runtime-wasm"
version = "0.1.0"
dependencies = [
"substrate-test-runtime 0.1.0",
]
[[package]]
name = "substrate-trie"
version = "0.4.0"
+7 -27
View File
@@ -1,41 +1,21 @@
[package]
name = "substrate-test-runtime"
name = "substrate-test-runtime-wasm"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
[lib]
name = "substrate_test_runtime"
crate-type = ["cdylib"]
[dependencies]
log = { version = "0.4", optional = true }
hex-literal = { version = "0.1.0", optional = true }
parity-codec = { version = "2.1", default-features = false }
parity-codec-derive = { version = "2.1", default-features = false }
substrate-primitives = { path = "../../primitives", default-features = false }
substrate-consensus-aura-primitives = { path = "../../consensus/aura/primitives", default-features = false }
substrate-client = { path = "../../client", default-features = false }
sr-std = { path = "../../sr-std", default-features = false }
sr-io = { path = "../../sr-io", default-features = false }
sr-version = { path = "../../sr-version", default-features = false }
sr-primitives = { path = "../../sr-primitives", default-features = false }
srml-support = { path = "../../../srml/support", default-features = false }
substrate-test-runtime = { path = "..", default-features = false }
[features]
default = []
std = [
"log",
"hex-literal",
"parity-codec/std",
"sr-std/std",
"sr-io/std",
"srml-support/std",
"sr-version/std",
"substrate-primitives/std",
"substrate-client/std",
"sr-primitives/std",
"substrate-consensus-aura-primitives/std",
"substrate-test-runtime/std",
]
[lib]
crate-type = ["cdylib"]
[profile.release]
panic = "abort"
lto = true
-1
View File
@@ -1 +0,0 @@
../src
@@ -0,0 +1,22 @@
// Copyright 2017-2018 Parity Technologies (UK) Ltd.
// This file is part of Substrate.
// Substrate is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Substrate is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
//! The Substrate test runtime reexported for WebAssembly compile.
#![cfg_attr(not(feature = "std"), no_std)]
extern crate substrate_test_runtime;
pub use substrate_test_runtime::*;