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

service: cleanup task spawning #495

Merged
merged 2 commits into from
Oct 25, 2019
Merged

service: cleanup task spawning #495

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f034447
service: cleanup task spawning
andresilva Oct 24, 2019
2033b9b
Merge branch 'master' into andre/cleanup-service-task-spawn
andresilva Oct 25, 2019
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
10 changes: 4 additions & 6 deletions service/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

pub mod chain_spec;

use futures::prelude::*;
use futures::sync::mpsc;
use client::LongestChain;
use std::sync::Arc;
Expand Down Expand Up @@ -263,8 +262,7 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
};

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(),
Expand All @@ -285,12 +283,12 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
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
Expand All @@ -303,7 +301,7 @@ pub fn new_full(config: Configuration<CustomConfiguration, GenesisConfig>)
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(
Expand Down