Migrate back to Substrate master (#528)

* migrate back to Substrate master

* fmt

* clippy
This commit is contained in:
Svyatoslav Nikolsky
2020-11-24 22:39:21 +03:00
committed by Bastian Köcher
parent 698d8d5600
commit dd7242bc79
32 changed files with 307 additions and 307 deletions
+6 -6
View File
@@ -16,14 +16,14 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
# Substrate Dependencies
frame-support = { version = "2.0", default-features = false }
frame-system = { version = "2.0", default-features = false }
sp-std = { version = "2.0", default-features = false }
sp-runtime = { version = "2.0", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
[dev-dependencies]
sp-core = "2.0"
sp-io = "2.0"
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
[features]
default = ["std"]
+2 -2
View File
@@ -463,7 +463,7 @@ mod tests {
vec![EventRecord {
phase: Phase::Initialization,
event: TestEvent::call_dispatch(Event::<TestRuntime>::MessageWeightMismatch(
origin, id, 1305000, 0,
origin, id, 1973000, 0,
)),
topics: vec![],
}],
@@ -488,7 +488,7 @@ mod tests {
vec![EventRecord {
phase: Phase::Initialization,
event: TestEvent::call_dispatch(Event::<TestRuntime>::MessageWeightMismatch(
origin, id, 1305000, 0,
origin, id, 1973000, 0,
)),
topics: vec![],
}],
+7 -7
View File
@@ -17,15 +17,15 @@ bp-header-chain = { path = "../../primitives/header-chain", default-features = f
# Substrate Dependencies
frame-benchmarking = { version = "2.0", default-features = false, optional = true }
frame-support = { version = "2.0", default-features = false }
frame-system = { version = "2.0", default-features = false }
sp-runtime = { version = "2.0", default-features = false }
sp-std = { version = "2.0", default-features = false, optional = true }
frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false, optional = true }
[dev-dependencies]
sp-core = "2.0"
sp-io = "2.0"
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
[features]
default = ["std"]
@@ -19,10 +19,10 @@ rialto-runtime = { path = "../../../bin/rialto/runtime" }
# Substrate Dependencies
sc-finality-grandpa = "0.8"
sp-blockchain = "2.0"
sp-finality-grandpa = "2.0"
sp-runtime = "2.0"
sc-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
[dev-dependencies]
sp-core = "2.0"
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
+6 -6
View File
@@ -17,12 +17,12 @@ bp-eth-poa = { path = "../../primitives/ethereum-poa", default-features = false
# Substrate Dependencies
frame-benchmarking = { version = "2.0", default-features = false, optional = true }
frame-support = { version = "2.0", default-features = false }
frame-system = { version = "2.0", default-features = false }
sp-io = { version = "2.0", default-features = false }
sp-runtime = { version = "2.0", default-features = false }
sp-std = { version = "2.0", default-features = false }
frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false, optional = true }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
[dev-dependencies]
libsecp256k1 = { version = "0.3.4", features = ["hmac"] }
+6 -6
View File
@@ -17,15 +17,15 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
# Substrate Dependencies
frame-support = { version = "2.0", default-features = false }
frame-system = { version = "2.0", default-features = false }
sp-core = { version = "2.0", default-features = false }
sp-runtime = { version = "2.0", default-features = false }
sp-std = { version = "2.0", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
[dev-dependencies]
hex-literal = "0.3"
sp-io = "2.0"
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
[features]
default = ["std"]
+9 -9
View File
@@ -9,9 +9,9 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
derive_more = "0.99.2"
futures = { version = "0.3.5", features = ["compat"] }
jsonrpc-core = "15.0.0"
jsonrpc-core-client = "15.0.0"
jsonrpc-derive = "15.0.0"
jsonrpc-core = "15.1.0"
jsonrpc-core-client = "15.1.0"
jsonrpc-derive = "15.1.0"
# Bridge dependencies
@@ -20,9 +20,9 @@ bp-message-lane = { path = "../../../primitives/message-lane" }
# Substrate Dependencies
sc-client-api = "2.0"
sp-blockchain = "2.0"
sp-core = "2.0"
sp-runtime = "2.0"
sp-state-machine = "0.8"
sp-trie = "2.0"
sc-client-api = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
@@ -11,15 +11,15 @@ codec = { package = "parity-scale-codec", version = "1.3.1", default-features =
# Substrate Dependencies
frame-support = { version = "2.0", default-features = false }
frame-system = { version = "2.0", default-features = false }
pallet-session = { version = "2.0", default-features = false }
sp-staking = { version = "2.0", default-features = false }
sp-std = { version = "2.0", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
pallet-session = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-staking = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
[dev-dependencies]
sp-core = "2.0"
sp-runtime = "2.0"
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
[features]
default = ["std"]
+10 -10
View File
@@ -19,18 +19,18 @@ bp-runtime = { path = "../../primitives/runtime", default-features = false }
# Substrate Dependencies
frame-support = { version = "2.0", default-features = false }
frame-system = { version = "2.0", default-features = false }
sp-finality-grandpa = { version = "2.0", default-features = false }
sp-runtime = { version = "2.0", default-features = false }
sp-std = { version = "2.0", default-features = false }
sp-trie = { version = "2.0", default-features = false }
frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
sp-trie = { git = "https://github.com/paritytech/substrate.git", branch = "master" , default-features = false }
[dev-dependencies]
sp-core = "2.0"
sp-io = "2.0"
sp-keyring = "2.0"
sp-state-machine = "0.8"
sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
[features]
default = ["std"]