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

Remove more instances of futures01 #4633

Merged
gnunicorn merged 30 commits into from
Feb 28, 2020
Merged

Remove more instances of futures01 #4633

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8da9a8a
Start removing last few instances of futures01
expenses Jan 15, 2020
1c61728
Use to_poll on wasm
expenses Jan 15, 2020
8f42407
Revert "Use to_poll on wasm"
expenses Jan 16, 2020
a80cc31
Fix fg test
expenses Jan 16, 2020
66f837a
Upgrade network test futures
expenses Jan 20, 2020
4e9e5c6
Update offchain hyper version
expenses Jan 20, 2020
7a429c6
Update service test
expenses Jan 21, 2020
738fff9
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Jan 21, 2020
19c8b38
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Jan 21, 2020
5d36bef
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Jan 24, 2020
9a196df
bump tokio to 0.2.10
expenses Jan 24, 2020
29b70b8
Removed some unneeded tokios
expenses Jan 24, 2020
6aeecf7
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Jan 27, 2020
c4fd68b
fixes
expenses Jan 27, 2020
553f9c1
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Jan 27, 2020
8b28b97
fix run_until_all_full
expenses Jan 27, 2020
b692425
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Jan 29, 2020
7c55e50
Make service test debuggable
expenses Jan 29, 2020
837aa0b
Update client/offchain/src/api/http.rs
expenses Jan 29, 2020
06ca442
Add service_test to test-int output
expenses Jan 29, 2020
25f1579
Merge branch 'ashley-more-futures' of github.com:paritytech/substrate…
expenses Jan 29, 2020
a0d4b37
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Jan 30, 2020
4270f7f
nitpicking
expenses Jan 30, 2020
b5e8f13
Merge remote-tracking branch 'parity/master' into HEAD
expenses Feb 6, 2020
64856fe
Finally fix test
expenses Feb 10, 2020
18fe65a
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Feb 10, 2020
6eb50f6
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Feb 27, 2020
bcc5b8b
Give up and revert client/serviec/test
expenses Feb 28, 2020
53c4ccf
Revert gitlab ci too
expenses Feb 28, 2020
143d62e
Merge remote-tracking branch 'parity/master' into ashley-more-futures
expenses Feb 28, 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 remote-tracking branch 'parity/master' into ashley-more-futures
  • Loading branch information
@expenses
expenses committed Feb 27, 2020
commit 6eb50f6d2e7059696d87be51a9005541fe5872d4
242 changes: 103 additions & 139 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -19,7 +19,7 @@ time = "0.1.42"
ansi_term = "0.12.1"
lazy_static = "1.4.0"
app_dirs = "1.2.1"
tokio = { version = "0.2.10", features = [ "signal", "rt-core", "rt-threaded" ] }
tokio = { version = "0.2.9", features = [ "signal", "rt-core", "rt-threaded" ] }
futures = "0.3.1"
fdlimit = "0.1.1"
serde_json = "1.0.41"
Expand Down
12 changes: 6 additions & 6 deletions client/consensus/aura/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ sp-timestamp = { version = "2.0.0-alpha.2", path = "../../../primitives/timestam
sc-telemetry = { version = "2.0.0-alpha.2", path = "../../telemetry" }

[dev-dependencies]
sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
sc-executor = { version = "0.8", path = "../../executor" }
sc-network = { version = "0.8", path = "../../network" }
sc-network-test = { version = "0.8.0", path = "../../network/test" }
sc-service = { version = "0.8", path = "../../service" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
sp-keyring = { version = "2.0.0-alpha.2", path = "../../../primitives/keyring" }
sc-executor = { version = "0.8.0-alpha.2", path = "../../executor" }
sc-network = { version = "0.8.0-alpha.2", path = "../../network" }
sc-network-test = { version = "0.8.0-dev", path = "../../network/test" }
sc-service = { version = "0.8.0-alpha.2", path = "../../service" }
substrate-test-runtime-client = { version = "2.0.0-dev", path = "../../../test-utils/runtime/client" }
env_logger = "0.7.0"
tempfile = "3.1.0"
14 changes: 7 additions & 7 deletions client/consensus/babe/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ pdqselect = "0.1.0"
derive_more = "0.99.2"

[dev-dependencies]
sp-keyring = { version = "2.0.0", path = "../../../primitives/keyring" }
sc-executor = { version = "0.8", path = "../../executor" }
sc-network = { version = "0.8", path = "../../network" }
sc-network-test = { version = "0.8.0", path = "../../network/test" }
sc-service = { version = "0.8", path = "../../service" }
substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils/runtime/client" }
sc-block-builder = { version = "0.8", path = "../../block-builder" }
sp-keyring = { version = "2.0.0-alpha.2", path = "../../../primitives/keyring" }
sc-executor = { version = "0.8.0-alpha.2", path = "../../executor" }
sc-network = { version = "0.8.0-alpha.2", path = "../../network" }
sc-network-test = { version = "0.8.0-dev", path = "../../network/test" }
sc-service = { version = "0.8.0-alpha.2", path = "../../service" }
substrate-test-runtime-client = { version = "2.0.0-dev", path = "../../../test-utils/runtime/client" }
sc-block-builder = { version = "0.8.0-alpha.2", path = "../../block-builder" }
env_logger = "0.7.0"
tempfile = "3.1.0"

Expand Down
9 changes: 8 additions & 1 deletion client/consensus/babe/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,14 @@ fn run_one_test(

futures::executor::block_on(future::select(
futures::future::poll_fn(move |cx| {
net.lock().poll(cx);
let mut net = net.lock();
net.poll(cx);
for p in net.peers() {
for (h, e) in p.failed_verifications() {
panic!("Verification failed for {:?}: {}", h, e);
}
}

Poll::<()>::Pending
}),
future::select(future::join_all(import_notifications), future::join_all(babe_futures))
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 @@ -50,4 +50,4 @@ sp-state-machine = { version = "0.8.0-alpha.2", path = "../../primitives/state-m
env_logger = "0.7.0"
tokio = { version = "0.2", features = ["rt-core"] }
tempfile = "3.1.0"
sp-api = { version = "2.0.0", path = "../../primitives/api" }
sp-api = { version = "2.0.0-alpha.2", path = "../../primitives/api" }
1 change: 0 additions & 1 deletion client/finality-grandpa/src/communication/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ fn voter_set_state() -> SharedVoterSetState<Block> {
set_state.into()
}


// needs to run in a tokio runtime.
pub(crate) fn make_test_network() -> (
impl Future<Output = Tester>,
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.