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

Update to futures 0.3.9 #7854

Merged
1 commit merged into from
Jan 8, 2021
Merged

Update to futures 0.3.9 #7854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
192 changes: 96 additions & 96 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/node/browser-testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ serde_json = "1.0.48"
wasm-bindgen = { version = "=0.2.69", features = ["serde-serialize"] }
wasm-bindgen-futures = "0.4.18"
wasm-bindgen-test = "0.3.18"
futures = "0.3.4"
futures = "0.3.9"

node-cli = { path = "../cli", default-features = false, features = ["browser"] , version = "2.0.0"}
sc-rpc-api = { path = "../../../client/rpc-api" , version = "0.8.0"}
2 changes: 1 addition & 1 deletion bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
sc-consensus-babe = { version = "0.8.0", features = ["test-helpers"], path = "../../../client/consensus/babe" }
sc-consensus-epochs = { version = "0.8.0", path = "../../../client/consensus/epochs" }
sc-service-test = { version = "2.0.0", path = "../../../client/service/test" }
futures = "0.3.4"
futures = "0.3.9"
tempfile = "3.1.0"
assert_cmd = "1.0"
nix = "0.17"
Expand Down
2 changes: 1 addition & 1 deletion client/authority-discovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async-trait = "0.1"
codec = { package = "parity-scale-codec", default-features = false, version = "1.3.4" }
derive_more = "0.99.2"
either = "1.5.3"
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
libp2p = { version = "0.33.0", default-features = false, features = ["kad"] }
log = "0.4.8"
Expand Down
2 changes: 1 addition & 1 deletion client/basic-authorship/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.4" }
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.8"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
Expand Down
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ log = "0.4.11"
atty = "0.2.13"
regex = "1.4.2"
tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
futures = "0.3.4"
futures = "0.3.9"
fdlimit = "0.2.1"
libp2p = "0.33.0"
parity-scale-codec = "1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/aura/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sc-client-api = { version = "2.0.0", path = "../../api" }
codec = { package = "parity-scale-codec", version = "1.3.4" }
sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
derive_more = "0.99.2"
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
log = "0.4.8"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/babe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
sp-utils = { version = "2.0.0", path = "../../../primitives/utils" }
fork-tree = { version = "2.0.0", path = "../../../utils/fork-tree" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../../utils/prometheus", version = "0.8.0"}
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
parking_lot = "0.11.1"
log = "0.4.8"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/manual-seal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
derive_more = "0.99.2"
futures = "0.3.4"
futures = "0.3.9"
jsonrpc-core = "15.1.0"
jsonrpc-core-client = "15.1.0"
jsonrpc-derive = "15.1.0"
Expand Down
2 changes: 1 addition & 1 deletion client/consensus/slots/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ sp-api = { version = "2.0.0", path = "../../../primitives/api" }
sc-telemetry = { version = "2.0.0", path = "../../telemetry" }
sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
sp-inherents = { version = "2.0.0", path = "../../../primitives/inherents" }
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
parking_lot = "0.11.1"
log = "0.4.11"
Expand Down
2 changes: 1 addition & 1 deletion client/finality-grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
derive_more = "0.99.2"
fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.8"
parking_lot = "0.11.1"
Expand Down
2 changes: 1 addition & 1 deletion client/informant/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
ansi_term = "0.12.1"
futures = "0.3.4"
futures = "0.3.9"
log = "0.4.8"
parity-util-mem = { version = "0.8.0", default-features = false, features = ["primitive-types"] }
sc-client-api = { version = "2.0.0", path = "../api" }
Expand Down
2 changes: 1 addition & 1 deletion client/keystore/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
async-trait = "0.1.30"
derive_more = "0.99.2"
futures = "0.3.4"
futures = "0.3.9"
futures-util = "0.3.4"
sp-application-crypto = { version = "2.0.0", path = "../../primitives/application-crypto" }
sp-core = { version = "2.0.0", path = "../../primitives/core" }
Expand Down
2 changes: 1 addition & 1 deletion client/network-gossip/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]


[dependencies]
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
libp2p = { version = "0.33.0", default-features = false }
log = "0.4.8"
Expand Down
2 changes: 1 addition & 1 deletion client/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ either = "1.5.3"
erased-serde = "0.3.9"
fnv = "1.0.6"
fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.2"
futures_codec = "0.4.0"
hex = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion client/network/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ async-std = "1.6.5"
sc-network = { version = "0.8.0", path = "../" }
log = "0.4.8"
parking_lot = "0.11.1"
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
rand = "0.7.2"
libp2p = { version = "0.33.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion client/offchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bytes = "0.5"
sc-client-api = { version = "2.0.0", path = "../api" }
sp-api = { version = "2.0.0", path = "../../primitives/api" }
fnv = "1.0.6"
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
log = "0.4.8"
threadpool = "1.7"
Expand Down
2 changes: 1 addition & 1 deletion client/offchain/src/api/timestamp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub fn timestamp_from_now(timestamp: Timestamp) -> Duration {
/// If `None`, returns a never-ending `Future`.
pub fn deadline_to_future(
deadline: Option<Timestamp>,
) -> futures::future::MaybeDone<impl futures::Future> {
) -> futures::future::MaybeDone<impl futures::Future<Output = ()>> {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The little change I'm talking about, needed to make it compile

use futures::future::{self, Either};

future::maybe_done(match deadline.map(timestamp_from_now) {
Expand Down
2 changes: 1 addition & 1 deletion client/peerset/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]


[dependencies]
futures = "0.3.4"
futures = "0.3.9"
libp2p = { version = "0.33.0", default-features = false }
sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
log = "0.4.8"
Expand Down
2 changes: 1 addition & 1 deletion client/telemetry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
parking_lot = "0.11.1"
futures = "0.3.4"
futures = "0.3.9"
futures-timer = "3.0.1"
wasm-timer = "0.2.5"
libp2p = { version = "0.33.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
Expand Down
2 changes: 1 addition & 1 deletion client/transaction-pool/graph/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
derive_more = "0.99.2"
thiserror = "1.0.21"
futures = "0.3.4"
futures = "0.3.9"
log = "0.4.8"
parking_lot = "0.11.1"
serde = { version = "1.0.101", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion primitives/blockchain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ log = "0.4.11"
lru = "0.6.1"
parking_lot = "0.11.1"
thiserror = "1.0.21"
futures = "0.3"
futures = "0.3.9"
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
sp-consensus = { version = "0.8.0", path = "../consensus/common" }
sp-runtime = { version = "2.0.0", path = "../runtime" }
Expand Down
2 changes: 1 addition & 1 deletion primitives/consensus/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../..
wasm-timer = "0.2.5"

[dev-dependencies]
futures = "0.3.4"
futures = "0.3.9"
sp-test-primitives = { version = "2.0.0", path = "../../test-primitives" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion primitives/utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ description = "I/O for Substrate runtimes"
readme = "README.md"

[dependencies]
futures = "0.3.4"
futures = "0.3.9"
futures-core = "0.3.4"
lazy_static = "1.4.0"
prometheus = { version = "0.10.0", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion test-utils/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.1" }
futures = "0.3.4"
futures = "0.3.9"
futures01 = { package = "futures", version = "0.1.29" }
hash-db = "0.15.2"
hex = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion test-utils/runtime/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ codec = { package = "parity-scale-codec", version = "1.3.1" }
sc-client-api = { version = "2.0.0", path = "../../../client/api" }
sc-consensus = { version = "0.8.0", path = "../../../client/consensus/common" }
sc-service = { version = "0.8.0", default-features = false, path = "../../../client/service" }
futures = "0.3.4"
futures = "0.3.9"