Fix integration test (#124)

cumulus/test/parachain/src/cli.rs

@@ -28,12 +28,6 @@ pub enum Subcommand {
 	/// Export the genesis state of the parachain.
 	#[structopt(name = "export-genesis-state")]
 	ExportGenesisState(ExportGenesisStateCommand),
-
-	/// Run Polkadot for testing purpose
-	Polkadot(polkadot_cli::Cli),
-
-	#[structopt(name = "validation-worker", setting = structopt::clap::AppSettings::Hidden)]
-	PolkadotValidationWorker(polkadot_cli::ValidationWorkerCommand),
 }
 
 /// Command for exporting the genesis state of the parachain

cumulus/test/parachain/src/command.rs

@@ -115,7 +115,8 @@ impl SubstrateCli for PolkadotCli {
 	}
 }
 
-fn generate_genesis_state(para_id: ParaId) -> Result<Block> {
+/// Generate the genesis block
+pub fn generate_genesis_state(para_id: ParaId) -> Result<Block> {
 	let storage = (&chain_spec::get_chain_spec(para_id)).build_storage()?;
 
 	let child_roots = storage.children_default.iter().map(|(sk, child_content)| {
@@ -156,7 +157,7 @@ pub fn run() -> Result<()> {
 			})
 		}
 		Some(Subcommand::ExportGenesisState(params)) => {
-			sc_cli::init_logger("", &<sc_cli::LogRotationOpt as structopt::StructOpt>::from_args())?;
+			sc_cli::init_logger("");
 
 			let block = generate_genesis_state(params.parachain_id.into())?;
 			let header_hex = format!("0x{:?}", HexDisplay::from(&block.header().encode()));
@@ -169,37 +170,6 @@ pub fn run() -> Result<()> {
 
 			Ok(())
 		}
-		Some(Subcommand::Polkadot(polkadot_cli)) => {
-			let runner = polkadot_cli.create_runner(&polkadot_cli.run.base)?;
-			let authority_discovery_enabled = polkadot_cli.run.authority_discovery_enabled;
-			let grandpa_pause = if polkadot_cli.run.grandpa_pause.is_empty() {
-				None
-			} else {
-				Some((
-					polkadot_cli.run.grandpa_pause[0],
-					polkadot_cli.run.grandpa_pause[1],
-				))
-			};
-
-			runner.run_node_until_exit(|config| match config.role {
-				Role::Light => polkadot_service::polkadot_new_light(config).map(|r| r.0),
-				_ => polkadot_service::polkadot_new_full(
-					config,
-					None,
-					None,
-					authority_discovery_enabled,
-					6000,
-					grandpa_pause,
-				)
-				.map(|(s, _, _)| s),
-			})
-		}
-		Some(Subcommand::PolkadotValidationWorker(cmd)) => {
-			sc_cli::init_logger("", &<sc_cli::LogRotationOpt as structopt::StructOpt>::from_args())?;
-			polkadot_service::run_validation_worker(&cmd.mem_id)?;
-
-			Ok(())
-		}
 		None => {
 			let runner = cli.create_runner(&*cli.run)?;
 
@@ -238,6 +208,7 @@ pub fn run() -> Result<()> {
 				info!("Parachain genesis state: {}", genesis_state);
 
 				crate::service::run_collator(config, key, polkadot_config, id)
+					.map(|x| x.task_manager)
 			})
 		}
 	}

cumulus/test/parachain/src/integration_test.rs

@@ -0,0 +1,211 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+use codec::Encode;
+use futures::{
+	future::{self, FutureExt},
+	pin_mut, select,
+};
+use polkadot_primitives::parachain::{Id as ParaId, Info, Scheduling};
+use polkadot_runtime_common::registrar;
+use polkadot_test_runtime_client::Sr25519Keyring;
+use sc_client_api::execution_extensions::ExecutionStrategies;
+use sc_informant::OutputFormat;
+use sc_network::{config::TransportConfig, multiaddr};
+use sc_service::{
+	config::{
+		DatabaseConfig, KeystoreConfig, MultiaddrWithPeerId, NetworkConfiguration,
+		WasmExecutionMethod,
+	},
+	BasePath, Configuration, Error as ServiceError, Role, TaskExecutor,
+};
+use std::{sync::Arc, time::Duration};
+use substrate_test_client::BlockchainEventsExt;
+use substrate_test_runtime_client::AccountKeyring::*;
+use tokio::{spawn, time::delay_for as sleep};
+
+static INTEGRATION_TEST_ALLOWED_TIME: Option<&str> = option_env!("INTEGRATION_TEST_ALLOWED_TIME");
+
+#[tokio::test]
+#[ignore]
+async fn integration_test() {
+	let task_executor: TaskExecutor = (|fut, _| {
+		spawn(fut);
+	})
+	.into();
+
+	// start alice
+	let mut alice =
+		polkadot_test_service::run_test_node(task_executor.clone(), Alice, || {}, vec![]);
+
+	// start bob
+	let mut bob = polkadot_test_service::run_test_node(
+		task_executor.clone(),
+		Bob,
+		|| {},
+		vec![alice.addr.clone()],
+	);
+
+	let t1 = sleep(Duration::from_secs(
+		INTEGRATION_TEST_ALLOWED_TIME
+			.and_then(|x| x.parse().ok())
+			.unwrap_or(600),
+	))
+	.fuse();
+
+	let t2 = async {
+		let para_id = ParaId::from(100);
+
+		future::join(alice.wait_for_blocks(2), bob.wait_for_blocks(2)).await;
+
+		// export genesis state
+		let genesis_state = crate::command::generate_genesis_state(para_id)
+			.unwrap()
+			.encode();
+
+		// create and sign transaction
+		let function = polkadot_test_runtime::Call::Sudo(pallet_sudo::Call::sudo(Box::new(
+			polkadot_test_runtime::Call::Registrar(registrar::Call::register_para(
+				para_id,
+				Info {
+					scheduling: Scheduling::Always,
+				},
+				parachain_runtime::WASM_BINARY.to_vec().into(),
+				genesis_state.into(),
+			)),
+		)));
+
+		// register parachain
+		let _ = alice.call_function(function, Alice).await.unwrap();
+
+		// run cumulus charlie
+		let key = Arc::new(sp_core::Pair::from_seed(&[10; 32]));
+		let mut polkadot_config = polkadot_test_service::node_config(
+			|| {},
+			task_executor.clone(),
+			Charlie,
+			vec![alice.addr.clone(), bob.addr.clone()],
+		);
+		use std::net::{Ipv4Addr, SocketAddr};
+		polkadot_config.rpc_http = Some(SocketAddr::new(Ipv4Addr::LOCALHOST.into(), 27016));
+		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();
+		sleep(Duration::from_secs(3)).await;
+		service.client.wait_for_blocks(4).await;
+
+		alice.task_manager.terminate();
+		bob.task_manager.terminate();
+	}
+	.fuse();
+
+	pin_mut!(t1, t2);
+
+	select! {
+		_ = t1 => {
+			panic!("the test took too long, maybe no parachain blocks have been produced");
+		},
+		_ = t2 => {},
+	}
+}
+
+pub fn parachain_config(
+	task_executor: TaskExecutor,
+	key: Sr25519Keyring,
+	boot_nodes: Vec<MultiaddrWithPeerId>,
+	para_id: ParaId,
+) -> Result<Configuration, ServiceError> {
+	let base_path = BasePath::new_temp_dir()?;
+	let root = base_path.path().to_path_buf();
+	let role = Role::Authority {
+		sentry_nodes: Vec::new(),
+	};
+	let key_seed = key.to_seed();
+	let spec = crate::chain_spec::get_chain_spec(para_id);
+
+	let mut network_config = NetworkConfiguration::new(
+		format!("Cumulus Test Node for: {}", key_seed),
+		"network/test/0.1",
+		Default::default(),
+		None,
+	);
+	let informant_output_format = OutputFormat {
+		enable_color: false,
+		prefix: format!("[{}] ", key_seed),
+	};
+
+	network_config.boot_nodes = boot_nodes;
+
+	network_config.allow_non_globals_in_dht = true;
+
+	network_config
+		.listen_addresses
+		.push(multiaddr::Protocol::Memory(rand::random()).into());
+
+	network_config.transport = TransportConfig::MemoryOnly;
+
+	Ok(Configuration {
+		impl_name: "cumulus-test-node".to_string(),
+		impl_version: "0.1".to_string(),
+		role,
+		task_executor,
+		transaction_pool: Default::default(),
+		network: network_config,
+		keystore: KeystoreConfig::Path {
+			path: root.join("key"),
+			password: None,
+		},
+		database: DatabaseConfig::RocksDb {
+			path: root.join("db"),
+			cache_size: 128,
+		},
+		state_cache_size: 16777216,
+		state_cache_child_ratio: None,
+		pruning: Default::default(),
+		chain_spec: Box::new(spec),
+		wasm_method: WasmExecutionMethod::Interpreted,
+		// NOTE: we enforce the use of the native runtime to make the errors more debuggable
+		execution_strategies: ExecutionStrategies {
+			syncing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+			importing: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+			block_construction: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+			offchain_worker: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+			other: sc_client_api::ExecutionStrategy::NativeWhenPossible,
+		},
+		rpc_http: None,
+		rpc_ws: None,
+		rpc_ipc: None,
+		rpc_ws_max_connections: None,
+		rpc_cors: None,
+		rpc_methods: Default::default(),
+		prometheus_config: None,
+		telemetry_endpoints: None,
+		telemetry_external_transport: None,
+		default_heap_pages: None,
+		offchain_worker: Default::default(),
+		force_authoring: false,
+		disable_grandpa: false,
+		dev_key_seed: Some(key_seed),
+		tracing_targets: None,
+		tracing_receiver: Default::default(),
+		max_runtime_instances: 8,
+		announce_block: true,
+		base_path: Some(base_path),
+		informant_output_format,
+	})
+}

cumulus/test/parachain/src/main.rs

@@ -24,6 +24,8 @@ mod chain_spec;
 mod service;
 mod cli;
 mod command;
+#[cfg(test)]
+mod integration_test;
 
 fn main() -> sc_cli::Result<()> {
 	command::run()

cumulus/test/parachain/src/service.rs

@@ -25,7 +25,7 @@ use sc_finality_grandpa::{
 	FinalityProofProvider as GrandpaFinalityProofProvider, StorageAndProofProvider,
 };
 use sc_informant::OutputFormat;
-use sc_service::{Configuration, TaskManager};
+use sc_service::{Configuration, ServiceComponents, TFullBackend, TFullClient};
 use std::sync::Arc;
 
 // Our native executor instance.
@@ -55,10 +55,12 @@ macro_rules! new_full_start {
 				client.clone(),
 				builder.prometheus_registry(),
 			));
-			let pool = sc_transaction_pool::BasicPool::new(
+			let pool = sc_transaction_pool::BasicPool::new_full(
 				builder.config().transaction_pool.clone(),
 				pool_api,
 				builder.prometheus_registry(),
+				builder.spawn_handle(),
+				client.clone(),
 			);
 			Ok(pool)
 		})?
@@ -86,7 +88,19 @@ pub fn run_collator(
 	key: Arc<CollatorPair>,
 	mut polkadot_config: polkadot_collator::Configuration,
 	id: polkadot_primitives::parachain::Id,
-) -> sc_service::error::Result<TaskManager> {
+) -> sc_service::error::Result<ServiceComponents<
+	parachain_runtime::opaque::Block,
+	TFullBackend<parachain_runtime::opaque::Block>,
+	sc_consensus::LongestChain<TFullBackend<parachain_runtime::opaque::Block>, parachain_runtime::opaque::Block>,
+	sc_transaction_pool::BasicPool<
+		sc_transaction_pool::FullChainApi<
+			TFullClient<parachain_runtime::opaque::Block, parachain_runtime::RuntimeApi, crate::service::Executor>,
+			parachain_runtime::opaque::Block,
+		>,
+		parachain_runtime::opaque::Block,
+	>,
+	TFullClient<parachain_runtime::opaque::Block, parachain_runtime::RuntimeApi, crate::service::Executor>,
+>> {
 	let mut parachain_config = prepare_collator_config(parachain_config);
 
 	parachain_config.informant_output_format = OutputFormat {
@@ -152,5 +166,5 @@ pub fn run_collator(
 		.spawn_essential_handle()
 		.spawn("polkadot", polkadot_future);
 
-	Ok(service.task_manager)
+	Ok(service)
 }