pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-20 10:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Asyncify launch_work a bit more (#777)

Browse Source 
* Asyncify launch_work a bit more

* An error message misword

* A bit more async in collator
This commit is contained in:
Fedor Sakharov
2020-01-20 19:13:48 +03:00
committed by GitHub
parent 3a49649a51
commit 9a9860c8bd
2 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/collator/src/lib.rs
+14 -13
View File
@@ -363,13 +363,15 @@ fn run_collator_node<S, E, P, Extrinsic>(
};
let inner_exit = exit.clone();
let work = client.import_notification_stream()
.for_each(move |notification| {
let work = async move {
let mut notification_stream = client.import_notification_stream();
while let Some(notification) = notification_stream.next().await {
macro_rules! try_fr {
($e:expr) => {
match $e {
Ok(x) => x,
Err(e) => return future::Either::Left(future::err(Error::Polkadot(
Err(e) => return (future::err(Error::Polkadot(
format!("{:?}", e)
))),
}
@@ -386,11 +388,11 @@ fn run_collator_node<S, E, P, Extrinsic>(
let validation_network = validation_network.clone();
let inner_exit_2 = inner_exit.clone();
let work = future::lazy(move |_| {
let work = future::lazy(move |_| async move {
let api = client.runtime_api();
let status = match try_fr!(api.parachain_status(&id, para_id)) {
Some(status) => status,
None => return future::Either::Left(future::ok(())),
None => return future::ok(()),
};
let validators = try_fr!(api.validators(&id));
@@ -407,14 +409,14 @@ fn run_collator_node<S, E, P, Extrinsic>(
validators,
};
let collation_work = collate(
if let Ok((collation, outgoing)) = collate(
relay_parent,
para_id,
status,
context,
parachain_context,
key,
).map_ok(move |(collation, outgoing)| {
).await {
network.with_spec(move |spec, ctx| {
let res = spec.add_local_collation(
ctx,
@@ -426,10 +428,9 @@ fn run_collator_node<S, E, P, Extrinsic>(
let exit = inner_exit_2.clone();
tokio::spawn(future::select(res.boxed(), exit).map(drop).map(|_| Ok(())).compat());
})
});
future::Either::Right(collation_work)
});
}
future::ok(())
});
let deadlined = future::select(
@@ -450,8 +451,8 @@ fn run_collator_node<S, E, P, Extrinsic>(
).map(drop);
tokio::spawn(future.map(|_| Ok(())).compat());
future::ready(())
});
}
}.boxed();
service.spawn_essential_task(work);