From 7daf41b327bbaf714cb908ae131efb815660676a Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Mon, 25 Nov 2019 14:35:04 +1300
Subject: [PATCH] fix build (#44)
---
auction/Cargo.toml | 6 +++---
currencies/Cargo.toml | 2 +-
oracle/Cargo.toml | 9 ++++-----
prices/Cargo.toml | 6 +++---
tokens/Cargo.toml | 2 +-
traits/Cargo.toml | 10 +++-------
utilities/Cargo.toml | 4 ++--
7 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/auction/Cargo.toml b/auction/Cargo.toml
index 473ca75..76bbdf1 100644
--- a/auction/Cargo.toml
+++ b/auction/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -18,7 +18,7 @@ orml-traits = { path = "../traits", default-features = false }
orml-utilities = { path = "../utilities", default-features = false }
[dev-dependencies]
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git", default-features = false }
clear_on_drop = { version = "0.2.3", features = ["no_cc"] } # https://github.com/paritytech/substrate/issues/4179
@@ -28,7 +28,7 @@ std = [
"serde",
"codec/std",
"sr-primitives/std",
- "runtime_io/std",
+ "runtime-io/std",
"rstd/std",
"frame-support/std",
"frame-system/std",
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
index 020d3a1..7c84020 100644
--- a/currencies/Cargo.toml
+++ b/currencies/Cargo.toml
@@ -17,7 +17,7 @@ frame-system = { git = "https://github.com/paritytech/substrate.git", default-fe
orml-traits = { path = "../traits", default-features = false }
[dev-dependencies]
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git", default-features = false }
pallet-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate.git" }
tokens = { package = "orml-tokens", path = "../tokens" }
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index 04d335a..2a7a9ce 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -8,9 +8,8 @@ edition = "2018"
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
-primitives = { git = "https://github.com/paritytech/substrate.git", package = "substrate-primitives", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -19,6 +18,7 @@ orml-traits = { path = "../traits", default-features = false }
orml-utilities = { path = "../utilities", default-features = false }
[dev-dependencies]
+primitives = { git = "https://github.com/paritytech/substrate.git", package = "substrate-primitives", default-features = false }
pallet-timestamp = { git = "https://github.com/paritytech/substrate.git" }
clear_on_drop = { version = "0.2.3", features = ["no_cc"] } # https://github.com/paritytech/substrate/issues/4179
@@ -29,11 +29,10 @@ std = [
"serde",
"codec/std",
"sr-primitives/std",
- "runtime_io/std",
+ "runtime-io/std",
"rstd/std",
- "primitives/std",
"frame-support/std",
"frame-system/std",
- "orml-utilities/std",
"orml-traits/std",
+ "orml-utilities/std",
]
diff --git a/prices/Cargo.toml b/prices/Cargo.toml
index 105ae03..9bc04f8 100644
--- a/prices/Cargo.toml
+++ b/prices/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -17,7 +17,7 @@ orml-traits = { path = "../traits", default-features = false }
orml-utilities = { path = "../utilities", default-features = false }
[dev-dependencies]
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git", default-features = false }
clear_on_drop = { version = "0.2.3", features = ["no_cc"] } # https://github.com/paritytech/substrate/issues/4179
@@ -26,7 +26,7 @@ default = ["std"]
std = [
"serde",
"codec/std",
- "runtime_io/std",
+ "runtime-io/std",
"sr-primitives/std",
"frame-support/std",
"frame-system/std",
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 1bd4d97..825db7d 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -18,7 +18,7 @@ orml-traits = { path = "../traits", default-features = false }
orml-utilities = { path = "../utilities", default-features = false }
[dev-dependencies]
-primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git" }
+primitives = { package = "substrate-primitives", git = "https://github.com/paritytech/substrate.git", default-features = false }
clear_on_drop = { version = "0.2.3", features = ["no_cc"] } # https://github.com/paritytech/substrate/issues/4179
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index 11b536e..036590f 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -8,14 +8,12 @@ edition = "2018"
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
num-traits = { version = "0.2.8", default-features = false }
impl-trait-for-tuples = "0.1.3"
-frame_support = { package = "frame-support", git = "https://github.com/paritytech/substrate.git" }
-frame_system = { package = "frame-system", git = "https://github.com/paritytech/substrate.git" }
-
+[dev-dependencies]
clear_on_drop = { version = "0.2.3", features = ["no_cc"] } # https://github.com/paritytech/substrate/issues/4179
[features]
@@ -24,9 +22,7 @@ std = [
"serde",
"codec/std",
"sr-primitives/std",
- "runtime_io/std",
+ "runtime-io/std",
"rstd/std",
"num-traits/std",
- "frame_support/std",
- "frame_system/std",
]
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
index 9407384..59772f2 100644
--- a/utilities/Cargo.toml
+++ b/utilities/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
sr-primitives = { git = "https://github.com/paritytech/substrate.git", default-features = false }
-runtime_io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
+runtime-io = { package = "sr-io", git = "https://github.com/paritytech/substrate.git", default-features = false }
rstd = { package = "sr-std", git = "https://github.com/paritytech/substrate.git", default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", default-features = false }
@@ -25,7 +25,7 @@ std = [
"serde",
"codec/std",
"sr-primitives/std",
- "runtime_io/std",
+ "runtime-io/std",
"rstd/std",
"frame-support/std",
"frame-system/std",
--
GitLab