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

update most of the dependencies #1946

Merged
merged 12 commits into from
Nov 17, 2020
Merged

update most of the dependencies #1946

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
04bba4c
update tiny-keccak to 0.2
ordian Nov 11, 2020
ac28cc6
update deps except bitvec and shared_memory
ordian Nov 11, 2020
7e8a442
fix some warning after futures upgrade
ordian Nov 11, 2020
3d16db4
remove useless package rename caused by bug in cargo-upgrade
ordian Nov 11, 2020
034e103
revert parity-util-mem *
ordian Nov 11, 2020
73fd5fa
remove unused import
ordian Nov 11, 2020
8d67484
cargo update
ordian Nov 11, 2020
65a5f59
remove all renames on parity-scale-codec
ordian Nov 16, 2020
bb1c419
Merge branch 'master' into ao-update-dependencies
ordian Nov 16, 2020
4a36454
remove the leftovers
ordian Nov 16, 2020
d44045b
remove unused dep
ordian Nov 16, 2020
247613e
Merge branch 'master' into ao-update-dependencies
ordian Nov 16, 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
2,103 changes: 1,099 additions & 1,004 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ readme = "README.md"

[dependencies]
cli = { package = "polkadot-cli", path = "cli" }
color-eyre = "0.5.6"
thiserror = "1"
futures = "0.3.4"
color-eyre = "0.5.7"
thiserror = "1.0.22"
futures = "0.3.8"
service = { package = "polkadot-service", path = "node/service" }
parity-util-mem = { version = "*", default-features = false, features = ["jemalloc-global"] }

[dev-dependencies]
assert_cmd = "0.12"
nix = "0.17"
assert_cmd = "1.0.1"
nix = "0.19.0"
tempfile = "3.1.0"

[workspace]
Expand Down
8 changes: 4 additions & 4 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ crate-type = ["cdylib", "rlib"]

[dependencies]
log = "0.4.11"
thiserror = "1.0.21"
structopt = { version = "0.3.8", optional = true }
wasm-bindgen = { version = "0.2.57", optional = true }
wasm-bindgen-futures = { version = "0.4.7", optional = true }
thiserror = "1.0.22"
structopt = { version = "0.3.20", optional = true }
wasm-bindgen = { version = "0.2.68", optional = true }
wasm-bindgen-futures = { version = "0.4.18", optional = true }

service = { package = "polkadot-service", path = "../node/service", default-features = false, optional = true }
polkadot-parachain = { path = "../parachain", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion core-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ edition = "2018"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = [ "derive" ] }
codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = [ "derive" ] }

[features]
default = [ "std" ]
Expand Down
6 changes: 3 additions & 3 deletions erasure-coding/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2018"

[dependencies]
primitives = { package = "polkadot-primitives", path = "../primitives" }
reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2"}
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
reed_solomon = { package = "reed-solomon-erasure", version = "4.0.2" }
codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = ["derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21"
thiserror = "1.0.22"
6 changes: 3 additions & 3 deletions node/collation-generation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
log = "0.4.8"
futures = "0.3.8"
log = "0.4.11"
polkadot-erasure-coding = { path = "../../erasure-coding" }
polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21"
thiserror = "1.0.22"

[dev-dependencies]
polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
10 changes: 5 additions & 5 deletions node/core/av-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
futures-timer = "3.0.2"
kvdb = "0.7.0"
kvdb-rocksdb = "0.9.1"
log = "0.4.11"
thiserror = "1.0.21"
thiserror = "1.0.22"

codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.5", features = ["derive"] }
erasure = { package = "polkadot-erasure-coding", path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
Expand All @@ -22,8 +22,8 @@ polkadot-primitives = { path = "../../../primitives" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

[dev-dependencies]
env_logger = "0.7.1"
assert_matches = "1.3.0"
env_logger = "0.8.1"
assert_matches = "1.4.0"
smallvec = "1.4.2"
kvdb-memorydb = "0.7.0"

Expand Down
4 changes: 2 additions & 2 deletions node/core/av-store/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,10 +527,10 @@ where
}
}
}
pov_pruning_time = pov_pruning_time => {
_ = pov_pruning_time => {
subsystem.prune_povs()?;
}
chunk_pruning_time = chunk_pruning_time => {
_ = chunk_pruning_time => {
subsystem.prune_chunks()?;
}
complete => return Ok(true),
Expand Down
8 changes: 4 additions & 4 deletions node/core/backing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
Expand All @@ -15,13 +15,13 @@ erasure-coding = { package = "polkadot-erasure-coding", path = "../../../erasure
statement-table = { package = "polkadot-statement-table", path = "../../../statement-table" }
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
log = "0.4.11"
thiserror = "1.0.21"
thiserror = "1.0.22"

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] }
assert_matches = "1.3.0"
futures = { version = "0.3.8", features = ["thread-pool"], package = "futures" }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
6 changes: 3 additions & 3 deletions node/core/bitfield-signing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
wasm-timer = "0.2.4"
thiserror = "1.0.21"
wasm-timer = "0.2.5"
thiserror = "1.0.22"
derive_more = "0.99.11"
4 changes: 2 additions & 2 deletions node/core/candidate-selection/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"
thiserror = "1.0.21"
thiserror = "1.0.22"
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
Expand Down
8 changes: 4 additions & 4 deletions node/core/candidate-validation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"

sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "master" }
parity-scale-codec = { version = "1.3.0", default-features = false, features = ["bit-vec", "derive"] }
parity-scale-codec = { version = "1.3.5", default-features = false, features = ["bit-vec", "derive"], package = "parity-scale-codec" }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand package correctly, one can use it to rename dependencies. Why is it needed here, given that it does not rename the import variable, but instead just repeats the name?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a bug in cargo-edit tool that I used to automatically bump all the dependencies. Reverted this change manually for futures in 3d16db4, thanks for catching this for parity-scale-codec, will fix now.


polkadot-primitives = { path = "../../../primitives" }
polkadot-parachain = { path = "../../../parachain" }
Expand All @@ -19,6 +19,6 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }

[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] }
assert_matches = "1.3.0"
futures = { version = "0.3.8", features = ["thread-pool"], package = "futures" }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
4 changes: 2 additions & 2 deletions node/core/chain-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = { version = "0.3.5" }
futures = "0.3.8"
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }

[dev-dependencies]
futures = { version = "0.3.5", features = ["thread-pool"] }
futures = { version = "0.3.8", features = ["thread-pool"], package = "futures" }
maplit = "1.0.2"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
4 changes: 2 additions & 2 deletions node/core/proposer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.4"
futures = "0.3.8"
futures-timer = "3.0.2"
log = "0.4.8"
log = "0.4.11"
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-overseer = { path = "../../overseer" }
polkadot-primitives = { path = "../../../primitives" }
Expand Down
4 changes: 2 additions & 2 deletions node/core/provisioner/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ edition = "2018"

[dependencies]
bitvec = { version = "0.17.4", default-features = false, features = ["alloc"] }
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"
thiserror = "1.0.21"
thiserror = "1.0.22"
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
Expand Down
4 changes: 2 additions & 2 deletions node/core/runtime-api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }

polkadot-primitives = { path = "../../../primitives" }
Expand All @@ -14,5 +14,5 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures = { version = "0.3.5", features = ["thread-pool"] }
futures = { version = "0.3.8", features = ["thread-pool"], package = "futures" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
12 changes: 6 additions & 6 deletions node/network/availability-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"
codec = { package="parity-scale-codec", version = "1.3.4", features = ["std"] }
codec = { package = "parity-scale-codec", version = "1.3.5", features = ["std"] }
polkadot-primitives = { path = "../../../primitives" }
polkadot-erasure-coding = { path = "../../../erasure-coding" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-network-protocol = { path = "../../network/protocol" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", features = ["std"] }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
thiserror = "1.0.21"
thiserror = "1.0.22"

[dev-dependencies]
polkadot-subsystem-testhelpers = { package = "polkadot-node-subsystem-test-helpers", path = "../../subsystem-test-helpers" }
Expand All @@ -24,6 +24,6 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
futures-timer = "3.0.2"
env_logger = "0.7.1"
assert_matches = "1.3.0"
smallvec = "1"
env_logger = "0.8.1"
assert_matches = "1.4.0"
smallvec = "1.4.2"
8 changes: 4 additions & 4 deletions node/network/bitfield-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"
codec = { package="parity-scale-codec", version = "1.3.4" }
codec = { package = "parity-scale-codec", version = "1.3.5" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
Expand All @@ -21,6 +21,6 @@ sp-application-crypto = { git = "https://github.com/paritytech/substrate", branc
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
maplit = "1.0.2"
env_logger = "0.7.1"
assert_matches = "1.3.0"
env_logger = "0.8.1"
assert_matches = "1.4.0"
tempfile = "3.1.0"
10 changes: 5 additions & 5 deletions node/network/bridge/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
async-trait = "0.1"
futures = "0.3.5"
async-trait = "0.1.41"
futures = "0.3.8"
log = "0.4.11"
polkadot-primitives = { path = "../../../primitives" }
parity-scale-codec = "1.3.4"
parity-scale-codec = { version = "1.3.5", package = "parity-scale-codec" }
sc-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
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" }
polkadot-node-network-protocol = { path = "../protocol" }

[dev-dependencies]
assert_matches = "1.3.0"
parking_lot = "0.10.0"
assert_matches = "1.4.0"
parking_lot = "0.11.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
8 changes: 4 additions & 4 deletions node/network/collator-protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"
thiserror = "1.0.21"
thiserror = "1.0.22"


polkadot-primitives = { path = "../../../primitives" }
Expand All @@ -16,8 +16,8 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }

[dev-dependencies]
env_logger = "0.7.1"
assert_matches = "1.3.0"
env_logger = "0.8.1"
assert_matches = "1.4.0"
smallvec = "1.4.2"
futures-timer = "3.0.2"

Expand Down
4 changes: 2 additions & 2 deletions node/network/pov-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"

[dependencies]
futures = "0.3.5"
futures = "0.3.8"
log = "0.4.11"
polkadot-primitives = { path = "../../../primitives" }
polkadot-subsystem = { package = "polkadot-node-subsystem", path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-network-protocol = { path = "../../network/protocol" }

[dev-dependencies]
assert_matches = "1.3.0"
assert_matches = "1.4.0"
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
2 changes: 1 addition & 1 deletion node/network/protocol/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ description = "Primitives types for the Node-side"
[dependencies]
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
parity-scale-codec = { version = "1.3.4", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "1.3.5", default-features = false, features = ["derive"], package = "parity-scale-codec" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
Loading