Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
21e9162
Switch service to futures03
expenses Dec 18, 2019
3e705f6
Fix tests
expenses Dec 18, 2019
566f190
Fix service test and cli
expenses Dec 18, 2019
3dd8ff4
Re-add Executor trait to SpawnTaskHandle
expenses Dec 19, 2019
be72319
Fix node-service
expenses Dec 19, 2019
b260cfe
Update babe
expenses Dec 19, 2019
07ba97d
Fix browser node
expenses Dec 19, 2019
84032dd
Update aura
expenses Dec 19, 2019
ae7dc83
Revert back to tokio-executor to fix runtime panic
expenses Dec 19, 2019
b0308aa
Add todo item
expenses Dec 19, 2019
ca1f5f2
Fix service tests again
expenses Dec 19, 2019
b455854
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Dec 20, 2019
f650750
Timeout test futures
expenses Dec 20, 2019
a3edd86
Fix tests
expenses Dec 20, 2019
846224b
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Dec 21, 2019
a087651
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 2, 2020
326da2a
nits
expenses Jan 3, 2020
dd538b6
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 3, 2020
62e45b2
Fix service test
expenses Jan 3, 2020
b4e8d03
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 6, 2020
f4ba4fa
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 6, 2020
5d03719
Remove zstd patch
expenses Jan 6, 2020
9f57013
Re-add futures01 to aura and babe tests as a dev-dep
expenses Jan 6, 2020
5cf66ca
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 7, 2020
49ab8a1
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 7, 2020
ab73e60
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 8, 2020
1390491
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 9, 2020
4a57419
Change failing test to tee
expenses Jan 9, 2020
2f99610
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 10, 2020
cd25fcc
Fix node
expenses Jan 10, 2020
078992f
Upgrade tokio
expenses Jan 10, 2020
208291a
fix society
gui1117 Jan 10, 2020
4e29d08
Merge remote-tracking branch 'parity/gui-fix-society' into ashley-ser…
expenses Jan 10, 2020
9c19763
Start switching grandpa to stable futures
expenses Jan 10, 2020
51e0ead
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 13, 2020
ebb26a2
Revert "Start switching grandpa to stable futures"
expenses Jan 13, 2020
5a51c55
Fix utils
expenses Jan 13, 2020
01e2073
Revert substrate service test
expenses Jan 14, 2020
6ad061b
Merge remote-tracking branch 'parity/master' into ashley-service-futures
expenses Jan 14, 2020
87c740e
Revert gitlab
expenses Jan 14, 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
Re-add futures01 to aura and babe tests as a dev-dep
  • Loading branch information
expenses committed Jan 6, 2020
commit 9f570138816518c71147ad83591824403bf30723
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions client/consensus/aura/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ substrate-test-runtime-client = { version = "2.0.0", path = "../../../test-utils
tokio = "0.1.22"
env_logger = "0.7.0"
tempfile = "3.1.0"
futures01 = { package = "futures", version = "0.1" }
6 changes: 3 additions & 3 deletions client/consensus/aura/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1002,10 +1002,10 @@ mod tests {
runtime.spawn(aura);
}

runtime.spawn(futures::future::poll_fn(move |_| {
runtime.spawn(futures01::future::poll_fn(move || {
net.lock().poll();
std::task::Poll::<()>::Pending
}).unit_error().compat());
Ok::<_, ()>(futures01::Async::NotReady::<()>)
}));

runtime.block_on(future::join_all(import_notifications)
.unit_error().compat()).unwrap();
Expand Down
1 change: 1 addition & 0 deletions client/consensus/babe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ sc-block-builder = { version = "2.0.0", path = "../../block-builder" }
tokio = "0.1.22"
env_logger = "0.7.0"
tempfile = "3.1.0"
futures01 = { package = "futures", version = "0.1" }

[features]
test-helpers = []
6 changes: 3 additions & 3 deletions client/consensus/babe/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -406,10 +406,10 @@ fn run_one_test(
}).expect("Starts babe").unit_error().compat());
}

runtime.spawn(futures::future::poll_fn(move |_| {
runtime.spawn(futures01::future::poll_fn(move || {
net.lock().poll();
std::task::Poll::<()>::Pending
}).unit_error().compat());
Ok::<_, ()>(futures01::Async::NotReady::<()>)
}));

runtime.block_on(future::join_all(import_notifications)
.unit_error().compat()).unwrap();
Expand Down