Switch to polkadot master branch (#230)

* Switch to polkadot master branch

* Fix compilation
This commit is contained in:
Bastian Köcher
2020-11-09 13:05:00 +01:00
committed by GitHub
parent 76f9ecae47
commit 182109ef5f
16 changed files with 124 additions and 95 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ cumulus-test-service = { path = "../service" }
cumulus-primitives = { path = "../../primitives" }
# Polkadot deps
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# Other deps
codec = { package = "parity-scale-codec", version = "1.0.5", default-features = false, features = [ "derive" ] }
+1 -1
View File
@@ -35,7 +35,7 @@ cumulus-primitives = { path = "../../primitives", default-features = false }
cumulus-runtime = { path = "../../runtime", default-features = false }
# Polkadot dependencies
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "bkchr-adder-collator-integration-test" }
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", default-features = false , branch = "master" }
[build-dependencies]
wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "2.0.0" }
+6 -6
View File
@@ -36,10 +36,10 @@ sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "master" }
# Polkadot
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-overseer = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# Cumulus
cumulus-consensus = { path = "../../consensus" }
@@ -56,8 +56,8 @@ futures = { version = "0.3.5" }
tokio = { version = "0.2.21", features = ["macros"] }
# Polkadot dependencies
polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "bkchr-adder-collator-integration-test" }
polkadot-test-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" }
polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
# Substrate dependencies
pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "master" }