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

Commit

Permalink
Revert branch switch
Browse files Browse the repository at this point in the history
  • Loading branch information
@expenses
expenses committed Jul 1, 2020
1 parent d06942b commit 7c7900c
Show file tree
Hide file tree
Showing 28 changed files with 582 additions and 583 deletions.
275 changes: 137 additions & 138 deletions Cargo.lock
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions availability-store/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ futures = "0.3.4"
tokio = { version = "0.2.13", features = ["rt-core"] }
exit-future = "0.2.0"
codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
kvdb = "0.6.0"
kvdb-memorydb = "0.6.0"

Expand Down
22 changes: 11 additions & 11 deletions cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ crate-type = ["cdylib", "rlib"]
log = "0.4.8"
futures = { version = "0.3.4", features = ["compat"] }
structopt = "0.3.8"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
service = { package = "polkadot-service", path = "../service", default-features = false, optional = true }
service-new = { package = "polkadot-service-new", path = "../node/service", default-features = false, optional = true }

tokio = { version = "0.2.13", features = ["rt-threaded"], optional = true }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

wasm-bindgen = { version = "0.2.57", optional = true }
wasm-bindgen-futures = { version = "0.4.7", optional = true }
browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", optional = true }
browser-utils = { package = "substrate-browser-utils", git = "https://github.com/paritytech/substrate", branch = "master", optional = true }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }

[features]
default = [ "wasmtime", "db", "cli", "service-old" ]
Expand Down
22 changes: 11 additions & 11 deletions collator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ edition = "2018"

[dependencies]
futures = "0.3.4"
sc-service = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../primitives" }
polkadot-cli = { path = "../cli" }
polkadot-network = { path = "../network" }
Expand All @@ -29,7 +29,7 @@ futures-timer = "2.0"
codec = { package = "parity-scale-codec", version = "1.3.0" }

[dev-dependencies]
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "master" }

[features]
default = ["service-old"]
Expand Down
4 changes: 2 additions & 2 deletions erasure-coding/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ edition = "2018"
primitives = { package = "polkadot-primitives", path = "../primitives" }
reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2"}
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
derive_more = "0.15.0"
16 changes: 8 additions & 8 deletions network/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ polkadot-validation = { path = "../validation" }
polkadot-primitives = { path = "../primitives" }
polkadot-erasure-coding = { path = "../erasure-coding" }
codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = "0.3.4"
log = "0.4.8"
exit-future = "0.2.0"
futures-timer = "2.0"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
wasm-timer = "0.2.4"

[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }
20 changes: 10 additions & 10 deletions network/test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ log = "0.4.8"
parking_lot = "0.10.0"
futures = "0.3.1"
rand = "0.7.2"
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "ashley-chainops" }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", features = ["test-helpers"], branch = "master" }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-test-runtime-client = { path = "../../runtime/test-runtime/client" }
4 changes: 2 additions & 2 deletions node/network/bridge/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ streamunordered = "0.5.1"
polkadot-primitives = { path = "../../../primitives" }
node-primitives = { package = "polkadot-node-primitives", path = "../../primitives" }
parity-scale-codec = "1.3.0"
sc-network = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion node/overseer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ log = "0.4.8"
futures-timer = "3.0.2"
streamunordered = "0.5.1"
polkadot-primitives = { path = "../../primitives" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops" }
client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../subsystem" }
async-trait = "0.1"

Expand Down
2 changes: 1 addition & 1 deletion node/primitives/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ description = "Primitives types for the Node-side"
polkadot-primitives = { path = "../../primitives" }
polkadot-statement-table = { path = "../../statement-table" }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["derive"] }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "ashley-chainops", default-features = false }
runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
async-trait = "0.1"
Loading

0 comments on commit 7c7900c

Please sign in to comment.