This repository was archived by the owner on Nov 15, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
depend-o-pocalipse #9450
Merged
gilescope
merged 29 commits into
paritytech:master
from
gilescope:giles-dependopocalipse
Aug 13, 2021
Merged
depend-o-pocalipse #9450
Changes from 23 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
d65cf70
batch1
0c369a3
batch2
6c4cc3d
batch3
209364c
batch4
47de272
making 3.0.0-dev packages 4.0.0-dev
f403df9
undo changes
bbdf293
too aggresive.
gilescope 549def7
undo
gilescope 6a25b85
update the lock file.
gilescope 63e0bbf
Merge remote-tracking branch 'origin/master' into giles-dependopocalipse
gilescope c01e2cf
Removing commented out deps
gilescope 9771146
Merge branch 'master' into giles-dependopocalipse
gilescope 2bea842
Remove some unused dev dependencies
gilescope f0a2991
Undo: Keep the PR focused on deps.
gilescope 172e9c6
Merge branch 'master' into giles-dependopocalipse
gilescope ddb41a1
removed commented out code
gilescope 20094b9
fixed deprecated method
gilescope 54b1411
tracked down test failure.
gilescope 5a2a3b9
Merge branch 'master' into giles-dependopocalipse
gilescope 9a67e3d
cargo fmt
gilescope 36e8903
cargo fmt
gilescope eb57400
tracing-subscriber needs to be 0.2.19
gilescope 890607b
Removing commented out lines
gilescope f9d92ce
Don't change crate versions to be consistent
gilescope ddf496b
Merge branch 'master' into giles-dependopocalipse
gilescope 01498e4
Base lock file off master's Cargo.lock
gilescope 8bddaba
Make test independent of wasm size
gilescope f94df3c
Correct Typo
gilescope 54b1790
Merge branch 'master' into giles-dependopocalipse
gilescope File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,20 @@ | ||
| [package] | ||
| name = "node-browser-testing" | ||
| version = "3.0.0-dev" | ||
| version = "4.0.0-dev" | ||
| authors = ["Parity Technologies <[email protected]>"] | ||
| description = "Tests for the in-browser light client." | ||
| edition = "2018" | ||
| license = "Apache-2.0" | ||
|
|
||
| [dependencies] | ||
| futures-timer = "3.0.2" | ||
| libp2p = { version = "0.37.1", default-features = false } | ||
| jsonrpc-core = "15.0.0" | ||
| serde = "1.0.126" | ||
| serde_json = "1.0.48" | ||
| wasm-bindgen = { version = "=0.2.73", features = ["serde-serialize"] } | ||
| wasm-bindgen-futures = "0.4.18" | ||
| wasm-bindgen-test = "0.3.18" | ||
| futures = "0.3.9" | ||
|
|
||
| node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "3.0.0-dev"} | ||
| sc-rpc-api = { path = "../../../client/rpc-api", version = "0.10.0-dev"} | ||
| node-cli = { path = "../cli", default-features = false, features = ["browser"], version = "4.0.0-dev"} | ||
|
|
||
| # This is a HACK to make browser tests pass. | ||
| # enables [`instant/wasm_bindgen`] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "node-cli" | ||
| version = "3.0.0-dev" | ||
| version = "4.0.0-dev" | ||
| authors = ["Parity Technologies <[email protected]>"] | ||
| description = "Generic Substrate node implementation in Rust." | ||
| build = "build.rs" | ||
|
|
@@ -41,10 +41,9 @@ hex-literal = "0.3.1" | |
| log = "0.4.8" | ||
| rand = "0.7.2" | ||
| structopt = { version = "0.3.8", optional = true } | ||
| parking_lot = "0.11.1" | ||
|
|
||
| # primitives | ||
| sp-authority-discovery = { version = "4.0.0-dev", path = "../../../primitives/authority-discovery" } | ||
| sp-authority-discovery = { version = "4.0.0-dev", path = "../../../primitives/authority-discovery" } | ||
| sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" } | ||
| grandpa-primitives = { version = "4.0.0-dev", package = "sp-finality-grandpa", path = "../../../primitives/finality-grandpa" } | ||
| sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" } | ||
|
|
@@ -54,7 +53,6 @@ sp-authorship = { version = "4.0.0-dev", path = "../../../primitives/authorship" | |
| sp-inherents = { version = "4.0.0-dev", path = "../../../primitives/inherents" } | ||
| sp-keyring = { version = "4.0.0-dev", path = "../../../primitives/keyring" } | ||
| sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" } | ||
| sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" } | ||
| sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" } | ||
| sp-transaction-pool = { version = "4.0.0-dev", path = "../../../primitives/transaction-pool" } | ||
| sp-transaction-storage-proof = { version = "4.0.0-dev", path = "../../../primitives/transaction-storage-proof" } | ||
|
|
@@ -70,34 +68,23 @@ sc-consensus-slots = { version = "0.10.0-dev", path = "../../../client/consensus | |
| sc-consensus-babe = { version = "0.10.0-dev", path = "../../../client/consensus/babe" } | ||
| sc-consensus-uncles = { version = "0.10.0-dev", path = "../../../client/consensus/uncles" } | ||
| grandpa = { version = "0.10.0-dev", package = "sc-finality-grandpa", path = "../../../client/finality-grandpa" } | ||
| sc-client-db = { version = "0.10.0-dev", default-features = false, path = "../../../client/db" } | ||
| sc-offchain = { version = "4.0.0-dev", path = "../../../client/offchain" } | ||
| sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" } | ||
| sc-basic-authorship = { version = "0.10.0-dev", path = "../../../client/basic-authorship" } | ||
| sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service" } | ||
| sc-tracing = { version = "4.0.0-dev", path = "../../../client/tracing" } | ||
| sc-telemetry = { version = "4.0.0-dev", path = "../../../client/telemetry" } | ||
| sc-authority-discovery = { version = "0.10.0-dev", path = "../../../client/authority-discovery" } | ||
| sc-authority-discovery = { version = "0.10.0-dev", path = "../../../client/authority-discovery" } | ||
| sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" } | ||
|
|
||
| # frame dependencies | ||
| pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" } | ||
| pallet-timestamp = { version = "4.0.0-dev", default-features = false, path = "../../../frame/timestamp" } | ||
| pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" } | ||
| frame-system = { version = "4.0.0-dev", path = "../../../frame/system" } | ||
| pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" } | ||
| pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" } | ||
| frame-support = { version = "4.0.0-dev", default-features = false, path = "../../../frame/support" } | ||
| pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../../frame/im-online" } | ||
| pallet-authority-discovery = { version = "4.0.0-dev", path = "../../../frame/authority-discovery" } | ||
| pallet-staking = { version = "4.0.0-dev", path = "../../../frame/staking" } | ||
| pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" } | ||
|
|
||
| # node-specific dependencies | ||
| node-runtime = { version = "3.0.0-dev", path = "../runtime" } | ||
| node-rpc = { version = "3.0.0-dev", path = "../rpc" } | ||
| node-runtime = { version = "4.0.0-dev", path = "../runtime" } | ||
| node-rpc = { version = "4.0.0-dev", path = "../rpc" } | ||
| node-primitives = { version = "2.0.0", path = "../primitives" } | ||
| node-executor = { version = "3.0.0-dev", path = "../executor" } | ||
| node-executor = { version = "4.0.0-dev", path = "../executor" } | ||
|
|
||
| # CLI-specific dependencies | ||
| sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli" } | ||
|
|
@@ -108,14 +95,24 @@ try-runtime-cli = { version = "0.10.0-dev", optional = true, path = "../../../ut | |
| # WASM-specific dependencies | ||
| wasm-bindgen = { version = "0.2.73", optional = true } | ||
| wasm-bindgen-futures = { version = "0.4.18", optional = true } | ||
| browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev"} | ||
| libp2p-wasm-ext = { version = "0.28", features = ["websocket"], optional = true } | ||
| browser-utils = { package = "substrate-browser-utils", path = "../../../utils/browser", optional = true, version = "0.10.0-dev" } | ||
| libp2p-wasm-ext = { version = "0.28", features = [ | ||
| "websocket", | ||
| ], optional = true } | ||
|
|
||
| [target.'cfg(target_arch="x86_64")'.dependencies] | ||
| node-executor = { version = "3.0.0-dev", path = "../executor", features = [ "wasmtime" ] } | ||
| sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli", features = [ "wasmtime" ] } | ||
| sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [ "wasmtime" ] } | ||
| sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/trie", features = ["memory-tracker"] } | ||
| node-executor = { version = "4.0.0-dev", path = "../executor", features = [ | ||
| "wasmtime", | ||
| ] } | ||
| sc-cli = { version = "0.10.0-dev", optional = true, path = "../../../client/cli", features = [ | ||
| "wasmtime", | ||
| ] } | ||
| sc-service = { version = "0.10.0-dev", default-features = false, path = "../../../client/service", features = [ | ||
| "wasmtime", | ||
| ] } | ||
| sp-trie = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/trie", features = [ | ||
| "memory-tracker", | ||
| ] } | ||
|
|
||
| [dev-dependencies] | ||
| sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" } | ||
|
|
@@ -148,7 +145,7 @@ path = "../../../client/cli" | |
| optional = true | ||
|
|
||
| [features] | ||
| default = [ "cli" ] | ||
| default = ["cli"] | ||
| browser = [ | ||
| "browser-utils", | ||
| "wasm-bindgen", | ||
|
|
@@ -172,7 +169,4 @@ runtime-benchmarks = [ | |
| ] | ||
| # Enable features that allow the runtime to be tried and debugged. Name might be subject to change | ||
| # in the near future. | ||
| try-runtime = [ | ||
| "node-runtime/try-runtime", | ||
| "try-runtime-cli", | ||
| ] | ||
| try-runtime = ["node-runtime/try-runtime", "try-runtime-cli"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "node-executor" | ||
| version = "3.0.0-dev" | ||
| version = "4.0.0-dev" | ||
| authors = ["Parity Technologies <[email protected]>"] | ||
| description = "Substrate node implementation in Rust." | ||
| edition = "2018" | ||
|
|
@@ -14,45 +14,34 @@ targets = ["x86_64-unknown-linux-gnu"] | |
| [dependencies] | ||
| codec = { package = "parity-scale-codec", version = "2.0.0" } | ||
| node-primitives = { version = "2.0.0", path = "../primitives" } | ||
| node-runtime = { version = "3.0.0-dev", path = "../runtime" } | ||
| node-runtime = { version = "4.0.0-dev", path = "../runtime" } | ||
| sc-executor = { version = "0.10.0-dev", path = "../../../client/executor" } | ||
| sp-core = { version = "4.0.0-dev", path = "../../../primitives/core" } | ||
| sp-keystore = { version = "0.10.0-dev", path = "../../../primitives/keystore" } | ||
| sp-io = { version = "4.0.0-dev", path = "../../../primitives/io" } | ||
| sp-state-machine = { version = "0.10.0-dev", path = "../../../primitives/state-machine" } | ||
| sp-trie = { version = "4.0.0-dev", path = "../../../primitives/trie" } | ||
| trie-root = "0.16.0" | ||
| frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" } | ||
|
|
||
| [dev-dependencies] | ||
| criterion = "0.3.0" | ||
| frame-support = { version = "4.0.0-dev", path = "../../../frame/support" } | ||
| frame-system = { version = "4.0.0-dev", path = "../../../frame/system" } | ||
| node-testing = { version = "3.0.0-dev", path = "../testing" } | ||
| node-testing = { version = "4.0.0-dev", path = "../testing" } | ||
| pallet-balances = { version = "4.0.0-dev", path = "../../../frame/balances" } | ||
| pallet-contracts = { version = "4.0.0-dev", path = "../../../frame/contracts" } | ||
| pallet-grandpa = { version = "4.0.0-dev", path = "../../../frame/grandpa" } | ||
| pallet-im-online = { version = "4.0.0-dev", path = "../../../frame/im-online" } | ||
| pallet-indices = { version = "4.0.0-dev", path = "../../../frame/indices" } | ||
| pallet-session = { version = "4.0.0-dev", path = "../../../frame/session" } | ||
| pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" } | ||
| pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" } | ||
| pallet-treasury = { version = "4.0.0-dev", path = "../../../frame/treasury" } | ||
| sp-application-crypto = { version = "4.0.0-dev", path = "../../../primitives/application-crypto" } | ||
| sp-consensus-babe = { version = "0.10.0-dev", path = "../../../primitives/consensus/babe" } | ||
| sp-runtime = { version = "4.0.0-dev", path = "../../../primitives/runtime" } | ||
| sp-externalities = { version = "0.10.0-dev", path = "../../../primitives/externalities" } | ||
| substrate-test-client = { version = "2.0.0", path = "../../../test-utils/client" } | ||
| wat = "1.0" | ||
| futures = "0.3.9" | ||
|
|
||
| [features] | ||
| wasmtime = [ | ||
| "sc-executor/wasmtime", | ||
| ] | ||
| wasmi-errno = [ | ||
| "sc-executor/wasmi-errno", | ||
| ] | ||
| wasmtime = ["sc-executor/wasmtime"] | ||
| wasmi-errno = ["sc-executor/wasmi-errno"] | ||
| stress-test = [] | ||
|
|
||
| [[bench]] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "node-rpc" | ||
| version = "3.0.0-dev" | ||
| version = "4.0.0-dev" | ||
| authors = ["Parity Technologies <[email protected]>"] | ||
| edition = "2018" | ||
| license = "Apache-2.0" | ||
|
|
@@ -23,7 +23,6 @@ sc-consensus-epochs = { version = "0.10.0-dev", path = "../../../client/consensu | |
| sc-chain-spec = { version = "4.0.0-dev", path = "../../../client/chain-spec" } | ||
| sc-finality-grandpa = { version = "0.10.0-dev", path = "../../../client/finality-grandpa" } | ||
| sc-finality-grandpa-rpc = { version = "0.10.0-dev", path = "../../../client/finality-grandpa/rpc" } | ||
| sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" } | ||
| sc-rpc-api = { version = "0.10.0-dev", path = "../../../client/rpc-api" } | ||
| sc-rpc = { version = "4.0.0-dev", path = "../../../client/rpc" } | ||
| sc-sync-state-rpc = { version = "0.10.0-dev", path = "../../../client/sync-state-rpc" } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| [package] | ||
| name = "node-runtime" | ||
| version = "3.0.0-dev" | ||
| version = "4.0.0-dev" | ||
| authors = ["Parity Technologies <[email protected]>"] | ||
| edition = "2018" | ||
| build = "build.rs" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.