Merge branch 'master' into gav-demo

This commit is contained in:
Gav
2018-03-14 12:03:44 +01:00
15 changed files with 283 additions and 40 deletions
+10
View File
@@ -392,6 +392,7 @@ version = "0.1.0"
dependencies = [
"polkadot-primitives 0.1.0",
"substrate-codec 0.1.0",
"substrate-misbehavior-check 0.1.0",
"substrate-primitives 0.1.0",
"substrate-runtime-io 0.1.0",
"substrate-runtime-std 0.1.0",
@@ -599,6 +600,15 @@ dependencies = [
"substrate-runtime-std 0.1.0",
]
[[package]]
name = "substrate-misbehavior-check"
version = "0.1.0"
dependencies = [
"substrate-codec 0.1.0",
"substrate-primitives 0.1.0",
"substrate-runtime-io 0.1.0",
]
[[package]]
name = "substrate-primitives"
version = "0.1.0"
+2
View File
@@ -12,6 +12,7 @@ substrate-runtime-std = { path = "../../../substrate/runtime-std", default-featu
substrate-runtime-io = { path = "../../../substrate/runtime-io", default-features = false }
substrate-runtime-support = { path = "../../../substrate/runtime-support", default-features = false }
substrate-primitives = { path = "../../../substrate/primitives", default-features = false }
substrate-misbehavior-check = { path = "../../../substrate/misbehavior-check", default-features = false }
polkadot-primitives = { path = "../../primitives", default-features = false }
[features]
@@ -22,6 +23,7 @@ std = [
"substrate-runtime-std/std",
"substrate-runtime-support/std",
"substrate-primitives/std",
"substrate-misbehavior-check/std",
"polkadot-primitives/std",
]