Collate only if --validator is given (#161)

Author: cecton

Cargo.lock

@@ -47,8 +47,8 @@ use sp_runtime::{
 use polkadot_collator::{
 	BuildParachainContext, Network as CollatorNetwork, ParachainContext, RuntimeApiCollection,
 };
-use polkadot_primitives::{
-	parachain::{self, BlockData, GlobalValidationSchedule, Id as ParaId, LocalValidationData},
+use polkadot_primitives::v0::{
+	self as parachain, BlockData, GlobalValidationData, Id as ParaId, LocalValidationData,
 	Block as PBlock, DownwardMessage, Hash as PHash,
 };
 
@@ -105,7 +105,7 @@ impl<Block: BlockT, PF, BI, BS> Collator<Block, PF, BI, BS> {
 	/// Get the inherent data with validation function parameters injected
 	fn inherent_data(
 		inherent_providers: InherentDataProviders,
-		global_validation: GlobalValidationSchedule,
+		global_validation: GlobalValidationData,
 		local_validation: LocalValidationData,
 		downward_messages: DownwardMessagesType,
 	) -> Option<InherentData> {
@@ -239,7 +239,7 @@ where
 	fn produce_candidate(
 		&mut self,
 		relay_chain_parent: PHash,
-		global_validation: GlobalValidationSchedule,
+		global_validation: GlobalValidationData,
 		local_validation: LocalValidationData,
 		downward_messages: Vec<DownwardMessage>,
 	) -> Self::ProduceCandidate {
@@ -493,10 +493,10 @@ mod tests {
 	use std::time::Duration;
 
 	use polkadot_collator::{collate, SignedStatement};
-	use polkadot_primitives::parachain::Id as ParaId;
+	use polkadot_primitives::v0::Id as ParaId;
 
 	use sp_blockchain::Result as ClientResult;
-	use sp_core::testing::SpawnBlockingExecutor;
+	use sp_core::testing::TaskExecutor;
 	use sp_inherents::InherentData;
 	use sp_keyring::Sr25519Keyring;
 	use sp_runtime::traits::{DigestFor, Header as HeaderT};
@@ -601,7 +601,7 @@ mod tests {
 	fn collates_produces_a_block() {
 		let id = ParaId::from(100);
 		let _ = env_logger::try_init();
-		let spawner = SpawnBlockingExecutor::new();
+		let spawner = TaskExecutor::new();
 		let announce_block = |_, _| ();
 		let block_announce_validator = DelayedBlockAnnounceValidator::new();
 		let client = Arc::new(TestClientBuilder::new().build());
@@ -639,7 +639,7 @@ mod tests {
 		let collation = collate(
 			Default::default(),
 			id,
-			GlobalValidationSchedule {
+			GlobalValidationData {
 				block_number: 0,
 				max_code_size: 0,
 				max_head_data_size: 0,

collator/src/lib.rs

@@ -26,9 +26,8 @@ use sp_runtime::{
 	traits::{Block as BlockT, Header as HeaderT},
 };
 
-use polkadot_primitives::{
-	parachain::{Id as ParaId, ParachainHost},
-	Block as PBlock, Hash as PHash,
+use polkadot_primitives::v0::{
+	Id as ParaId, ParachainHost, Block as PBlock, Hash as PHash,
 };
 
 use codec::Decode;

consensus/src/lib.rs

@@ -32,11 +32,10 @@ use sp_runtime::{
 
 use polkadot_collator::Network as CollatorNetwork;
 use polkadot_network::legacy::gossip::{GossipMessage, GossipStatement};
-use polkadot_primitives::{
-	parachain::{Id as ParaId, ParachainHost},
-	Block as PBlock, Hash as PHash,
+use polkadot_primitives::v0::{
+	Id as ParaId, ParachainHost, Block as PBlock, Hash as PHash,
 };
-use polkadot_statement_table::{SignedStatement, Statement};
+use polkadot_statement_table::v0::{SignedStatement, Statement};
 use polkadot_validation::check_statement;
 
 use cumulus_primitives::HeadData;

network/src/lib.rs

@@ -16,13 +16,10 @@
 
 use super::*;
 use cumulus_test_runtime::{Block, Header};
-use polkadot_primitives::{
-	parachain::{
-		AbridgedCandidateReceipt, Chain, CollatorId, DutyRoster, GlobalValidationSchedule,
-		Id as ParaId, LocalValidationData, ParachainHost, Retriable, SigningContext,
-		ValidationCode, ValidatorId,
-	},
-	Block as PBlock, Hash as PHash, Header as PHeader,
+use polkadot_primitives::v0::{
+	AbridgedCandidateReceipt, Chain, CollatorId, DutyRoster, GlobalValidationData,
+	Id as ParaId, LocalValidationData, ParachainHost, Retriable, SigningContext,
+	ValidationCode, ValidatorId, Block as PBlock, Hash as PHash, Header as PHeader,
 };
 use polkadot_test_runtime_client::{
 	DefaultTestClientBuilderExt, TestClient, TestClientBuilder, TestClientBuilderExt,
@@ -418,7 +415,7 @@ sp_api::mock_impl_runtime_apis! {
 			Some(ValidationCode(Vec::new()))
 		}
 
-		fn global_validation_schedule() -> GlobalValidationSchedule {
+		fn global_validation_data() -> GlobalValidationData {
 			Default::default()
 		}
 
@@ -440,7 +437,7 @@ sp_api::mock_impl_runtime_apis! {
 			}
 		}
 
-		fn downward_messages(_: ParaId) -> Vec<polkadot_primitives::DownwardMessage> {
+		fn downward_messages(_: ParaId) -> Vec<polkadot_primitives::v0::DownwardMessage> {
 			Vec::new()
 		}
 	}

network/src/tests.rs

@@ -16,7 +16,7 @@ parachain = { package = "polkadot-parachain", git = "https://github.com/parityte
 # Substrate dependencies
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", version = "2.0.0-dev", default-features = false }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", version = "2.0.0-rc5", default-features = false }
 sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }

parachain-upgrade/Cargo.toml

@@ -18,7 +18,7 @@
 
 use codec::{Decode, Encode};
 use polkadot_parachain::primitives::{RelayChainBlockNumber, ValidationParams};
-use polkadot_primitives::parachain::{GlobalValidationSchedule, LocalValidationData};
+use polkadot_primitives::v0::{GlobalValidationData, LocalValidationData};
 
 /// Validation Function Parameters
 ///
@@ -48,8 +48,8 @@ impl From<&ValidationParams> for ValidationFunctionParams {
 	}
 }
 
-impl From<(GlobalValidationSchedule, LocalValidationData)> for ValidationFunctionParams {
-	fn from(t: (GlobalValidationSchedule, LocalValidationData)) -> Self {
+impl From<(GlobalValidationData, LocalValidationData)> for ValidationFunctionParams {
+	fn from(t: (GlobalValidationData, LocalValidationData)) -> Self {
 		let (global_validation, local_validation) = t;
 		ValidationFunctionParams {
 			max_code_size: global_validation.max_code_size,

primitives/src/validation_function_params.rs

@@ -16,7 +16,7 @@
 
 //! XMCP related primitives
 
-use polkadot_primitives::parachain::Id as ParaId;
+use polkadot_primitives::v0::Id as ParaId;
 use sp_std::vec::Vec;
 
 /// A raw XCMP message that is being send between two Parachain's.

primitives/src/xcmp.rs

@@ -31,15 +31,18 @@ sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "cumu
 sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-service = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
-sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", version = "0.8.0-alpha.5" }
+sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", version = "0.8.0-rc5" }
 sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-trie = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 sc-informant = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 
 # Cumulus dependencies
 cumulus-consensus = { path = "../../consensus" }
@@ -72,6 +75,5 @@ polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch
 
 # Substrate dependencies
 pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
-sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 substrate-test-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
 substrate-test-runtime-client = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }

test/parachain/Cargo.toml

@@ -152,8 +152,10 @@ pub fn run() -> Result<()> {
 		Some(Subcommand::Base(subcommand)) => {
 			let runner = cli.create_runner(subcommand)?;
 
-			runner.run_subcommand(subcommand, |config| {
-				Ok(new_full_start!(config).0.to_chain_ops_parts())
+			runner.run_subcommand(subcommand, |mut config| {
+				let params = crate::service::new_partial(&mut config)?;
+
+				Ok((params.client, params.backend, params.import_queue, params.task_manager))
 			})
 		}
 		Some(Subcommand::ExportGenesisState(params)) => {
@@ -185,7 +187,7 @@ pub fn run() -> Result<()> {
 			let id = ParaId::from(cli.run.parachain_id);
 
 			let parachain_account =
-				AccountIdConversion::<polkadot_primitives::AccountId>::into_account(&id);
+				AccountIdConversion::<polkadot_primitives::v0::AccountId>::into_account(&id);
 
 			let block = generate_genesis_state(id)?;
 			let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
@@ -207,8 +209,8 @@ pub fn run() -> Result<()> {
 				info!("Parachain Account: {}", parachain_account);
 				info!("Parachain genesis state: {}", genesis_state);
 
-				crate::service::run_collator(config, key, polkadot_config, id)
-					.map(|x| x.task_manager)
+				crate::service::run_collator(config, key, polkadot_config, id, cli.run.base.validator)
+					.map(|(x, _)| x)
 			})
 		}
 	}

test/parachain/src/command.rs

@@ -19,7 +19,7 @@ use futures::{
 	future::{self, FutureExt},
 	pin_mut, select,
 };
-use polkadot_primitives::parachain::{Id as ParaId, Info, Scheduling};
+use polkadot_primitives::v0::{Id as ParaId, Info, Scheduling};
 use polkadot_runtime_common::registrar;
 use polkadot_test_runtime_client::Sr25519Keyring;
 use sc_client_api::execution_extensions::ExecutionStrategies;
@@ -43,9 +43,8 @@ static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TE
 #[ignore]
 async fn integration_test() {
 	let task_executor: TaskExecutor = (|fut, _| {
-		spawn(fut);
-	})
-	.into();
+		spawn(fut).map(|_| ())
+	}).into();
 
 	// start alice
 	let mut alice =
@@ -104,10 +103,10 @@ async fn integration_test() {
 		polkadot_config.rpc_methods = sc_service::config::RpcMethods::Unsafe;
 		let parachain_config =
 			parachain_config(task_executor.clone(), Charlie, vec![], para_id).unwrap();
-		let service =
-			crate::service::run_collator(parachain_config, key, polkadot_config, para_id).unwrap();
+		let (_service, charlie_client) =
+			crate::service::run_collator(parachain_config, key, polkadot_config, para_id, true).unwrap();
 		sleep(Duration::from_secs(3)).await;
-		service.client.wait_for_blocks(4).await;
+		charlie_client.wait_for_blocks(4).await;
 
 		alice.task_manager.terminate();
 		bob.task_manager.terminate();