Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

removes use of sc_client::Client from sc-rpc #5063

Merged
gnunicorn merged 12 commits into from
Mar 5, 2020
Merged

removes use of sc_client::Client from sc-rpc #5063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
810ad59
removes use of sc_client::Client from sc-rpc
seunlanlege Feb 26, 2020
22d99ea
Merge branch 'master' of github.com:paritytech/substrate into seun-re…
seunlanlege Feb 27, 2020
0a8c7af
Merge branch 'master' of github.com:paritytech/substrate into seun-re…
seunlanlege Feb 27, 2020
4f8f536
remove Client impl from sc-finality-benches
seunlanlege Feb 27, 2020
ec722cf
remove client impl from sc-finality-grandpa
seunlanlege Feb 28, 2020
f3be157
Merge branch 'master' of github.com:paritytech/substrate into seun-re…
seunlanlege Feb 28, 2020
da882c6
read_proof accepts iterator
arkpar Feb 28, 2020
82e9367
remove generic Executor param from ExecutorProvider
seunlanlege Mar 2, 2020
2756334
fix long ass line
seunlanlege Mar 4, 2020
4a1b1ff
code style changes
seunlanlege Mar 4, 2020
fc14261
Merge branch 'master' of github.com:paritytech/substrate into seun-re…
seunlanlege Mar 5, 2020
2dc641c
merge with master
seunlanlege Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:paritytech/substrate into seun-re… 
…move-client-sc-rpc
  • Loading branch information
@seunlanlege
seunlanlege committed Feb 27, 2020
commit 22d99eaa5ef7e53de8154008dc74ccd44dd0db30
34 changes: 17 additions & 17 deletions bin/node-template/node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ futures = "0.3.1"
log = "0.4.8"
structopt = "0.3.8"

sc-cli = { version = "0.8.0-alpha.1", path = "../../../client/cli" }
sp-core = { version = "2.0.0-alpha.1", path = "../../../primitives/core" }
sc-executor = { version = "0.8.0-alpha.1", path = "../../../client/executor" }
sc-service = { version = "0.8.0-alpha.1", path = "../../../client/service" }
sp-inherents = { version = "2.0.0-alpha.1", path = "../../../primitives/inherents" }
sc-transaction-pool = { version = "2.0.0-alpha.1", path = "../../../client/transaction-pool" }
sp-transaction-pool = { version = "2.0.0-alpha.1", path = "../../../primitives/transaction-pool" }
sc-network = { version = "0.8.0-alpha.1", path = "../../../client/network" }
sc-consensus-aura = { version = "0.8.0-alpha.1", path = "../../../client/consensus/aura" }
sp-consensus-aura = { version = "0.8.0-alpha.1", path = "../../../primitives/consensus/aura" }
sp-consensus = { version = "0.8.0-alpha.1", path = "../../../primitives/consensus/common" }
grandpa = { version = "0.8.0-alpha.1", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
grandpa-primitives = { version = "2.0.0-alpha.1", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
sc-client = { version = "0.8.0-alpha.1", path = "../../../client/" }
sc-client-api = { version = "2.0.0-alpha.1", path = "../../../client/api" }
sp-runtime = { version = "2.0.0-alpha.1", path = "../../../primitives/runtime" }
sc-basic-authorship = { path = "../../../client/basic-authorship" , version = "0.8.0-alpha.1"}
sc-cli = { version = "0.8.0-alpha.2", path = "../../../client/cli" }
sp-core = { version = "2.0.0-alpha.2", path = "../../../primitives/core" }
sc-executor = { version = "0.8.0-alpha.2", path = "../../../client/executor" }
sc-service = { version = "0.8.0-alpha.2", path = "../../../client/service" }
sp-inherents = { version = "2.0.0-alpha.2", path = "../../../primitives/inherents" }
sc-transaction-pool = { version = "2.0.0-alpha.2", path = "../../../client/transaction-pool" }
sp-transaction-pool = { version = "2.0.0-alpha.2", path = "../../../primitives/transaction-pool" }
sc-network = { version = "0.8.0-alpha.2", path = "../../../client/network" }
sc-consensus-aura = { version = "0.8.0-alpha.2", path = "../../../client/consensus/aura" }
sp-consensus-aura = { version = "0.8.0-alpha.2", path = "../../../primitives/consensus/aura" }
sp-consensus = { version = "0.8.0-alpha.2", path = "../../../primitives/consensus/common" }
grandpa = { version = "0.8.0-alpha.2", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" }
grandpa-primitives = { version = "2.0.0-alpha.2", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" }
sc-client = { version = "0.8.0-alpha.2", path = "../../../client/" }
sc-client-api = { version = "2.0.0-alpha.2", path = "../../../client/api" }
sp-runtime = { version = "2.0.0-alpha.2", path = "../../../primitives/runtime" }
sc-basic-authorship = { path = "../../../client/basic-authorship" , version = "0.8.0-alpha.2"}

node-template-runtime = { version = "2.0.0-alpha.2", path = "../runtime" }

Expand Down
20 changes: 10 additions & 10 deletions client/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ sp-keyring = { version = "2.0.0-alpha.2", path = "../../primitives/keyring" }
kvdb = "0.4.0"
log = { version = "0.4.8" }
parking_lot = "0.10.0"
sp-core = { version = "2.0.0-alpha.1", default-features = false, path = "../../primitives/core" }
sp-std = { version = "2.0.0-alpha.1", default-features = false, path = "../../primitives/std" }
sp-version = { version = "2.0.0-alpha.1", default-features = false, path = "../../primitives/version" }
sp-api = { version = "2.0.0-alpha.1", path = "../../primitives/api" }
sp-runtime = { version = "2.0.0-alpha.1", default-features = false, path = "../../primitives/runtime" }
sp-state-machine = { version = "0.8.0-alpha.1", path = "../../primitives/state-machine" }
sc-telemetry = { version = "2.0.0-alpha.1", path = "../telemetry" }
sp-trie = { version = "2.0.0-alpha.1", path = "../../primitives/trie" }
sp-storage = { version = "2.0.0-alpha.1", path = "../../primitives/storage" }
sp-transaction-pool = { version = "2.0.0-alpha.1", path = "../../primitives/transaction-pool" }
sp-core = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/core" }
sp-std = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/std" }
sp-version = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/version" }
sp-api = { version = "2.0.0-alpha.2", path = "../../primitives/api" }
sp-runtime = { version = "2.0.0-alpha.2", default-features = false, path = "../../primitives/runtime" }
sp-state-machine = { version = "0.8.0-alpha.2", path = "../../primitives/state-machine" }
sc-telemetry = { version = "2.0.0-alpha.2", path = "../telemetry" }
sp-trie = { version = "2.0.0-alpha.2", path = "../../primitives/trie" }
sp-storage = { version = "2.0.0-alpha.2", path = "../../primitives/storage" }
sp-transaction-pool = { version = "2.0.0-alpha.2", path = "../../primitives/transaction-pool" }

[dev-dependencies]
sp-test-primitives = { version = "2.0.0-dev", path = "../../primitives/test-primitives" }
You are viewing a condensed version of this merge commit. You can view the full changes here.