From f034447e908764242974302d060f207404e5bfd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Thu, 24 Oct 2019 12:22:17 +0100 Subject: [PATCH] service: cleanup task spawning --- service/src/lib.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/service/src/lib.rs b/service/src/lib.rs index 2c705faa0155..70567a7d892e 100644 --- a/service/src/lib.rs +++ b/service/src/lib.rs @@ -18,7 +18,6 @@ pub mod chain_spec; -use futures::prelude::*; use futures::sync::mpsc; use client::LongestChain; use std::sync::Arc; @@ -263,8 +262,7 @@ pub fn new_full(config: Configuration) }; let babe = start_babe(babe_config)?; - let select = babe.select(service.on_exit()).then(|_| Ok(())); - service.spawn_essential_task(Box::new(select)); + service.spawn_essential_task(babe); let authority_discovery = authority_discovery::AuthorityDiscovery::new( service.client(), @@ -285,12 +283,12 @@ pub fn new_full(config: Configuration) match (is_authority, disable_grandpa) { (false, false) => { // start the lightweight GRANDPA observer - service.spawn_task(Box::new(grandpa::run_grandpa_observer( + service.spawn_task(grandpa::run_grandpa_observer( config, link_half, service.network(), service.on_exit(), - )?)); + )?); }, (true, false) => { // start the full GRANDPA voter @@ -303,7 +301,7 @@ pub fn new_full(config: Configuration) telemetry_on_connect: Some(service.telemetry_on_connect_stream()), voting_rule: grandpa::VotingRulesBuilder::default().build(), }; - service.spawn_essential_task(Box::new(grandpa::run_grandpa_voter(grandpa_config)?)); + service.spawn_essential_task(grandpa::run_grandpa_voter(grandpa_config)?); }, (_, true) => { grandpa::setup_disabled_grandpa(