Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:paritytech/substrate into seun-sc…
…-light
  • Loading branch information
seunlanlege committed Jun 9, 2020
commit 1aa15429a70e1073a4e4d94b6a0e826f6fa7b21e
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/light/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
description = "components for a light client"
name = "sc-light"
version = "2.0.0-rc2"
version = "2.0.0-rc3"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
authors = ["Parity Technologies <[email protected]>"]
edition = "2018"
Expand Down
38 changes: 19 additions & 19 deletions client/service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,25 +40,25 @@ hash-db = "0.15.2"
serde = "1.0.101"
serde_json = "1.0.41"
sysinfo = "0.13.3"
sc-keystore = { version = "2.0.0-rc2", path = "../keystore" }
sp-io = { version = "2.0.0-rc2", path = "../../primitives/io" }
sp-runtime = { version = "2.0.0-rc2", path = "../../primitives/runtime" }
sp-trie = { version = "2.0.0-rc2", path = "../../primitives/trie" }
sp-externalities = { version = "0.8.0-rc2", path = "../../primitives/externalities" }
sp-utils = { version = "2.0.0-rc2", path = "../../primitives/utils" }
sp-version = { version = "2.0.0-rc2", path = "../../primitives/version" }
sp-blockchain = { version = "2.0.0-rc2", path = "../../primitives/blockchain" }
sp-core = { version = "2.0.0-rc2", path = "../../primitives/core" }
sp-session = { version = "2.0.0-rc2", path = "../../primitives/session" }
sp-state-machine = { version = "0.8.0-rc2", path = "../../primitives/state-machine" }
sp-application-crypto = { version = "2.0.0-rc2", path = "../../primitives/application-crypto" }
sp-consensus = { version = "0.8.0-rc2", path = "../../primitives/consensus/common" }
sc-network = { version = "0.8.0-rc2", path = "../network" }
sc-chain-spec = { version = "2.0.0-rc2", path = "../chain-spec" }
sc-light = { version = "2.0.0-rc2", path = "../light" }
sc-client-api = { version = "2.0.0-rc2", path = "../api" }
sp-api = { version = "2.0.0-rc2", path = "../../primitives/api" }
sc-client-db = { version = "0.8.0-rc2", default-features = false, path = "../db" }
sc-keystore = { version = "2.0.0-rc3", path = "../keystore" }
sp-io = { version = "2.0.0-rc3", path = "../../primitives/io" }
sp-runtime = { version = "2.0.0-rc3", path = "../../primitives/runtime" }
sp-trie = { version = "2.0.0-rc3", path = "../../primitives/trie" }
sp-externalities = { version = "0.8.0-rc3", path = "../../primitives/externalities" }
sp-utils = { version = "2.0.0-rc3", path = "../../primitives/utils" }
sp-version = { version = "2.0.0-rc3", path = "../../primitives/version" }
sp-blockchain = { version = "2.0.0-rc3", path = "../../primitives/blockchain" }
sp-core = { version = "2.0.0-rc3", path = "../../primitives/core" }
sp-session = { version = "2.0.0-rc3", path = "../../primitives/session" }
sp-state-machine = { version = "0.8.0-rc3", path = "../../primitives/state-machine" }
sp-application-crypto = { version = "2.0.0-rc3", path = "../../primitives/application-crypto" }
sp-consensus = { version = "0.8.0-rc3", path = "../../primitives/consensus/common" }
sc-network = { version = "0.8.0-rc3", path = "../network" }
sc-chain-spec = { version = "2.0.0-rc3", path = "../chain-spec" }
sc-light = { version = "2.0.0-rc3", path = "../light" }
sc-client-api = { version = "2.0.0-rc3", path = "../api" }
sp-api = { version = "2.0.0-rc3", path = "../../primitives/api" }
sc-client-db = { version = "0.8.0-rc3", default-features = false, path = "../db" }
codec = { package = "parity-scale-codec", version = "1.3.0" }
sc-executor = { version = "0.8.0-rc3", path = "../executor" }
sc-transaction-pool = { version = "2.0.0-rc3", path = "../transaction-pool" }
Expand Down
26 changes: 13 additions & 13 deletions client/service/test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ log = "0.4.8"
env_logger = "0.7.0"
fdlimit = "0.1.4"
parking_lot = "0.10.0"
sc-light = { version = "2.0.0-rc3", path = "../../light" }
sp-blockchain = { version = "2.0.0-rc3", path = "../../../primitives/blockchain" }
sp-api = { version = "2.0.0-rc3", path = "../../../primitives/api" }
sp-state-machine = { version = "0.8.0-rc3", path = "../../../primitives/state-machine" }
Expand All @@ -28,17 +29,16 @@ sp-trie = { version = "2.0.0-rc3", path = "../../../primitives/trie" }
sp-storage = { version = "2.0.0-rc3", path = "../../../primitives/storage" }
sc-client-db = { version = "0.8.0-rc3", default-features = false, path = "../../db" }
futures = { version = "0.3.1", features = ["compat"] }
sc-service = { version = "0.8.0-rc2", default-features = false, features = ["test-helpers"], path = "../../service" }
sc-network = { version = "0.8.0-rc2", path = "../../network" }
sp-consensus = { version = "0.8.0-rc2", path = "../../../primitives/consensus/common" }
sp-runtime = { version = "2.0.0-rc2", path = "../../../primitives/runtime" }
sp-core = { version = "2.0.0-rc2", path = "../../../primitives/core" }
sp-transaction-pool = { version = "2.0.0-rc2", path = "../../../primitives/transaction-pool" }
substrate-test-runtime = { version = "2.0.0-rc2", path = "../../../test-utils/runtime" }
substrate-test-runtime-client = { version = "2.0.0-rc2", path = "../../../test-utils/runtime/client" }
sc-client-api = { version = "2.0.0-rc2", path = "../../api" }
sc-block-builder = { version = "0.8.0-rc2", path = "../../block-builder" }
sc-executor = { version = "0.8.0-rc2", path = "../../executor" }
sc-light = { version = "2.0.0-rc2", path = "../../light" }
sp-panic-handler = { version = "2.0.0-rc2", path = "../../../primitives/panic-handler" }
sc-service = { version = "0.8.0-rc3", default-features = false, features = ["test-helpers"], path = "../../service" }
sc-network = { version = "0.8.0-rc3", path = "../../network" }
sp-consensus = { version = "0.8.0-rc3", path = "../../../primitives/consensus/common" }
sp-runtime = { version = "2.0.0-rc3", path = "../../../primitives/runtime" }
sp-core = { version = "2.0.0-rc3", path = "../../../primitives/core" }
sp-transaction-pool = { version = "2.0.0-rc3", path = "../../../primitives/transaction-pool" }
substrate-test-runtime = { version = "2.0.0-rc3", path = "../../../test-utils/runtime" }
substrate-test-runtime-client = { version = "2.0.0-rc3", path = "../../../test-utils/runtime/client" }
sc-client-api = { version = "2.0.0-rc3", path = "../../api" }
sc-block-builder = { version = "0.8.0-rc3", path = "../../block-builder" }
sc-executor = { version = "0.8.0-rc3", path = "../../executor" }
sp-panic-handler = { version = "2.0.0-rc3", path = "../../../primitives/panic-handler" }
parity-scale-codec = "1.3.0"
14 changes: 7 additions & 7 deletions test-utils/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
sc-client-api = { version = "2.0.0-rc2", path = "../../client/api" }
sc-light = { version = "2.0.0-rc2", path = "../../client/light" }
sc-client-db = { version = "0.8.0-rc2", features = ["test-helpers"], path = "../../client/db" }
sp-consensus = { version = "0.8.0-rc2", path = "../../primitives/consensus/common" }
sc-executor = { version = "0.8.0-rc2", path = "../../client/executor" }
sc-consensus = { version = "0.8.0-rc2", path = "../../client/consensus/common" }
sc-service = { version = "0.8.0-rc2", default-features = false, features = ["test-helpers"], path = "../../client/service" }
sc-client-api = { version = "2.0.0-rc3", path = "../../client/api" }
sc-light = { version = "2.0.0-rc3", path = "../../client/light" }
sc-client-db = { version = "0.8.0-rc3", features = ["test-helpers"], path = "../../client/db" }
sp-consensus = { version = "0.8.0-rc3", path = "../../primitives/consensus/common" }
sc-executor = { version = "0.8.0-rc3", path = "../../client/executor" }
sc-consensus = { version = "0.8.0-rc3", path = "../../client/consensus/common" }
sc-service = { version = "0.8.0-rc3", default-features = false, features = ["test-helpers"], path = "../../client/service" }
futures = "0.3.4"
hash-db = "0.15.2"
sp-keyring = { version = "2.0.0-rc3", path = "../../primitives/keyring" }
Expand Down
9 changes: 4 additions & 5 deletions test-utils/runtime/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ publish = false
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
sc-light = { version = "2.0.0-rc3", path = "../../../client/light" }
sp-consensus = { version = "0.8.0-rc3", path = "../../../primitives/consensus/common" }
sc-block-builder = { version = "0.8.0-rc3", path = "../../../client/block-builder" }
substrate-test-client = { version = "2.0.0-rc3", path = "../../client" }
Expand All @@ -21,9 +22,7 @@ sp-runtime = { version = "2.0.0-rc3", path = "../../../primitives/runtime" }
sp-api = { version = "2.0.0-rc3", path = "../../../primitives/api" }
sp-blockchain = { version = "2.0.0-rc3", path = "../../../primitives/blockchain" }
codec = { package = "parity-scale-codec", version = "1.3.0" }
sc-client-api = { version = "2.0.0-rc2", path = "../../../client/api" }
sc-consensus = { version = "0.8.0-rc2", path = "../../../client/consensus/common" }
sc-service = { version = "0.8.0-rc2", default-features = false, path = "../../../client/service" }
sc-light = { version = "2.0.0-rc2", default-features = false, path = "../../../client/light" }

sc-client-api = { version = "2.0.0-rc3", path = "../../../client/api" }
sc-consensus = { version = "0.8.0-rc3", path = "../../../client/consensus/common" }
sc-service = { version = "0.8.0-rc3", default-features = false, path = "../../../client/service" }
futures = "0.3.4"
You are viewing a condensed version of this merge commit. You can view the full changes here.