allow jobs to spawn sub-tasks (#2030)

* allow jobs to spawn sub-tasks

* fix fallout in subsytems

polkadot/node/core/backing/src/lib.rs

@@ -52,6 +52,7 @@ use polkadot_node_subsystem_util::{
 	request_from_runtime,
 	Validator,
 	delegated_subsystem,
+	FromJobCommand,
 	metrics::{self, prometheus},
 };
 use statement_table::{
@@ -197,9 +198,9 @@ enum FromJob {
 	StatementDistribution(StatementDistributionMessage),
 }
 
-impl From<FromJob> for AllMessages {
-	fn from(f: FromJob) -> Self {
-		match f {
+impl From<FromJob> for FromJobCommand {
+	fn from(f: FromJob) -> FromJobCommand {
+		FromJobCommand::SendMessage(match f {
 			FromJob::AvailabilityStore(msg) => AllMessages::AvailabilityStore(msg),
 			FromJob::RuntimeApiMessage(msg) => AllMessages::RuntimeApi(msg),
 			FromJob::CandidateValidation(msg) => AllMessages::CandidateValidation(msg),
@@ -207,7 +208,7 @@ impl From<FromJob> for AllMessages {
 			FromJob::StatementDistribution(msg) => AllMessages::StatementDistribution(msg),
 			FromJob::PoVDistribution(msg) => AllMessages::PoVDistribution(msg),
 			FromJob::Provisioner(msg) => AllMessages::Provisioner(msg),
-		}
+		})
 	}
 }
 

polkadot/node/core/bitfield-signing/src/lib.rs

@@ -30,7 +30,7 @@ use polkadot_node_subsystem::{
 	errors::RuntimeApiError,
 };
 use polkadot_node_subsystem_util::{
-	self as util, JobManager, JobTrait, ToJobTrait, Validator,
+	self as util, JobManager, JobTrait, ToJobTrait, Validator, FromJobCommand,
 	metrics::{self, prometheus},
 };
 use polkadot_primitives::v1::{AvailabilityBitfield, CoreState, Hash, ValidatorIndex};
@@ -90,14 +90,14 @@ pub enum FromJob {
 	RuntimeApi(RuntimeApiMessage),
 }
 
-impl From<FromJob> for AllMessages {
-	fn from(from_job: FromJob) -> AllMessages {
-		match from_job {
+impl From<FromJob> for FromJobCommand {
+	fn from(from_job: FromJob) -> FromJobCommand {
+		FromJobCommand::SendMessage(match from_job {
 			FromJob::AvailabilityStore(asm) => AllMessages::AvailabilityStore(asm),
 			FromJob::BitfieldDistribution(bdm) => AllMessages::BitfieldDistribution(bdm),
 			FromJob::CandidateBacking(cbm) => AllMessages::CandidateBacking(cbm),
 			FromJob::RuntimeApi(ram) => AllMessages::RuntimeApi(ram),
-		}
+		})
 	}
 }
 

polkadot/node/core/candidate-selection/src/lib.rs

@@ -30,7 +30,7 @@ use polkadot_node_subsystem::{
 	},
 };
 use polkadot_node_subsystem_util::{
-	self as util, delegated_subsystem, JobTrait, ToJobTrait,
+	self as util, delegated_subsystem, JobTrait, ToJobTrait, FromJobCommand,
 	metrics::{self, prometheus},
 };
 use polkadot_primitives::v1::{CandidateReceipt, CollatorId, Hash, Id as ParaId, PoV};
@@ -89,12 +89,12 @@ enum FromJob {
 	Collator(CollatorProtocolMessage),
 }
 
-impl From<FromJob> for AllMessages {
-	fn from(from_job: FromJob) -> AllMessages {
-		match from_job {
+impl From<FromJob> for FromJobCommand {
+	fn from(from_job: FromJob) -> FromJobCommand {
+		FromJobCommand::SendMessage(match from_job {
 			FromJob::Backing(msg) => AllMessages::CandidateBacking(msg),
 			FromJob::Collator(msg) => AllMessages::CollatorProtocol(msg),
-		}
+		})
 	}
 }
 

polkadot/node/core/provisioner/src/lib.rs

@@ -33,7 +33,7 @@ use polkadot_node_subsystem::{
 };
 use polkadot_node_subsystem_util::{
 	self as util,
-	delegated_subsystem,
+	delegated_subsystem, FromJobCommand,
 	request_availability_cores, request_persisted_validation_data, JobTrait, ToJobTrait,
 	metrics::{self, prometheus},
 };
@@ -98,12 +98,12 @@ enum FromJob {
 	Runtime(RuntimeApiMessage),
 }
 
-impl From<FromJob> for AllMessages {
-	fn from(from_job: FromJob) -> AllMessages {
-		match from_job {
+impl From<FromJob> for FromJobCommand {
+	fn from(from_job: FromJob) -> FromJobCommand {
+		FromJobCommand::SendMessage(match from_job {
 			FromJob::ChainApi(cam) => AllMessages::ChainApi(cam),
 			FromJob::Runtime(ram) => AllMessages::RuntimeApi(ram),
-		}
+		})
 	}
 }