Make a test crate to make the runtime-test usable

Cargo.toml

@@ -27,6 +27,7 @@ members = [
 	"erasure-coding",
 	"network",
 	"network/test",
+	"polkadot-test",
 	"primitives",
 	"runtime/common",
 	"runtime/parachains",

polkadot-test/Cargo.toml

@@ -0,0 +1,71 @@
+[package]
+name = "polkadot-test"
+version = "0.8.2"
+authors = ["Parity Technologies <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+parking_lot = "0.9.0"
+serde = { version = "1.0.102", features = ["derive"] }
+lazy_static = "1.4.0"
+log = "0.4.8"
+futures = "0.3.4"
+slog = "2.5.2"
+hex-literal = "0.2.1"
+av_store = { package = "polkadot-availability-store", path = "../availability-store", optional = true }
+consensus = { package = "polkadot-validation", path = "../validation", optional = true }
+polkadot-primitives = { path = "../primitives" }
+polkadot-runtime = { path = "../runtime/polkadot" }
+kusama-runtime = { path = "../runtime/kusama" }
+westend-runtime = { path = "../runtime/westend" }
+polkadot-test-runtime = { path = "../runtime/test-runtime" }
+polkadot-network = { path = "../network", optional = true }
+polkadot-rpc = { path = "../rpc" }
+polkadot-service = { path = "../service" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-network = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch", default-features = false }
+telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sc-block-builder = { 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-keystore = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+codec = { package = "parity-scale-codec", version = "1.3.0" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+prometheus-endpoint = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+
+[dev-dependencies]
+polkadot-test-runtime-client = { path = "../runtime/test-runtime/client" }
+sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "cumulus-branch" }
+env_logger = "0.7.0"
+
+[features]
+default = ["db", "full-node"]
+db = ["service/db"]
+runtime-benchmarks = ["polkadot-runtime/runtime-benchmarks", "kusama-runtime/runtime-benchmarks", "westend-runtime/runtime-benchmarks"]
+full-node = ["av_store", "consensus", "polkadot-network"]

polkadot-test/src/lib.rs

@@ -0,0 +1,92 @@
+// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot 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.
+
+// Polkadot 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 Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Polkadot service. Specialized wrapper over substrate service.
+
+//pub mod chain_spec;
+//mod grandpa_support;
+//mod client;
+
+use std::sync::Arc;
+use std::time::Duration;
+use polkadot_primitives::{parachain, Hash, BlockId, AccountId, Nonce, Balance};
+#[cfg(feature = "full-node")]
+use polkadot_network::{legacy::gossip::Known, protocol as network_protocol};
+use service::{error::Error as ServiceError, ServiceBuilder};
+use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
+use sc_executor::native_executor_instance;
+use log::info;
+pub use service::{
+	AbstractService, Role, PruningMode, TransactionPoolOptions, Error, RuntimeGenesis,
+	TFullClient, TLightClient, TFullBackend, TLightBackend, TFullCallExecutor, TLightCallExecutor,
+	Configuration, ChainSpec, ServiceBuilderCommand,
+};
+pub use service::config::{DatabaseConfig, PrometheusConfig};
+pub use sc_executor::NativeExecutionDispatch;
+pub use sc_client_api::{Backend, ExecutionStrategy, CallExecutor};
+pub use sc_consensus::LongestChain;
+pub use sp_api::{Core as CoreApi, ConstructRuntimeApi, ProvideRuntimeApi, StateBackend};
+pub use sp_runtime::traits::{HashFor, NumberFor};
+pub use consensus_common::{SelectChain, BlockImport, block_validation::Chain};
+pub use polkadot_primitives::parachain::{CollatorId, ParachainHost};
+pub use polkadot_primitives::Block;
+pub use sp_runtime::traits::{Block as BlockT, self as runtime_traits, BlakeTwo256};
+pub use polkadot_service::{PolkadotChainSpec, KusamaChainSpec, WestendChainSpec};
+#[cfg(feature = "full-node")]
+pub use consensus::run_validation_worker;
+pub use codec::Codec;
+pub use polkadot_runtime;
+pub use kusama_runtime;
+pub use westend_runtime;
+pub use polkadot_test_runtime;
+use prometheus_endpoint::Registry;
+pub use polkadot_service::PolkadotClient;
+pub use polkadot_service::{grandpa_support, new_full, new_full_start, FullNodeHandles, IdentifyVariant, PolkadotExecutor};
+
+/// Create a new Polkadot test service for a full node.
+pub fn polkadot_test_new_full(
+	mut config: Configuration,
+	collating_for: Option<(CollatorId, parachain::Id)>,
+	max_block_data_size: Option<u64>,
+	authority_discovery_enabled: bool,
+	slot_duration: u64,
+	grandpa_pause: Option<(u32, u32)>,
+	informant_prefix: Option<String>,
+)
+	-> Result<(
+		impl AbstractService,
+		Arc<impl PolkadotClient<
+			Block,
+			TFullBackend<Block>,
+			polkadot_test_runtime::RuntimeApi
+		>>,
+		FullNodeHandles,
+	), ServiceError>
+{
+	let (service, client, handles) = new_full!(
+		config,
+		collating_for,
+		max_block_data_size,
+		authority_discovery_enabled,
+		slot_duration,
+		grandpa_pause,
+		polkadot_test_runtime::RuntimeApi,
+		PolkadotExecutor,
+		informant_prefix,
+	);
+
+	Ok((service, client, handles))
+}

runtime/test-runtime/Cargo.toml

@@ -14,9 +14,11 @@ serde = { version = "1.0.102", default-features = false }
 serde_derive = { version = "1.0.102", optional = true }
 smallvec = "1.4.0"
 
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -27,6 +29,7 @@ version = { package = "sp-version", git = "https://github.com/paritytech/substra
 tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 
+authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -69,6 +72,8 @@ default = ["std"]
 no_std = []
 only-staking = []
 std = [
+	"authority-discovery-primitives/std",
+	"authority-discovery/std",
 	"bitvec/std",
 	"primitives/std",
 	"rustc-hex/std",
@@ -79,6 +84,7 @@ std = [
 	"sp-api/std",
 	"tx-pool-api/std",
 	"block-builder-api/std",
+	"offchain-primitives/std",
 	"rstd/std",
 	"sp-io/std",
 	"frame-support/std",

runtime/test-runtime/src/genesismap.rs

@@ -67,6 +67,7 @@ impl GenesisConfig {
 			parachains: None,
 			registrar: None,
 			vesting: None,
+			authority_discovery: None,
 		};
 		config.assimilate_storage(&mut storage).expect("Adding `system::GensisConfig` to the genesis");
 

runtime/test-runtime/src/lib.rs

@@ -54,6 +54,7 @@ use frame_support::{
 	traits::{KeyOwnerProofSystem, Randomness},
 	weights::Weight,
 };
+use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId;
 use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 use session::historical as session_historical;
 
@@ -435,6 +436,8 @@ impl offences::Trait for Runtime {
 	type WeightSoftLimit = OffencesWeightSoftLimit;
 }
 
+impl authority_discovery::Trait for Runtime {}
+
 parameter_types! {
 	pub const ParathreadDeposit: Balance = 5 * DOLLARS;
 	pub const QueueSize: usize = 2;
@@ -512,6 +515,7 @@ construct_runtime! {
 		Historical: session_historical::{Module},
 		Session: session::{Module, Call, Storage, Event, Config<T>},
 		Grandpa: grandpa::{Module, Call, Storage, Config, Event},
+		AuthorityDiscovery: authority_discovery::{Module, Call, Config},
 
 		// Claims. Usable initially.
 		Claims: claims::{Module, Call, Storage, Event<T>, Config<T>, ValidateUnsigned},
@@ -618,6 +622,20 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	impl offchain_primitives::OffchainWorkerApi<Block> for Runtime {
+		fn offchain_worker(header: &<Block as BlockT>::Header) {
+			Executive::offchain_worker(header)
+		}
+	}
+
+	impl authority_discovery_primitives::AuthorityDiscoveryApi<Block> for Runtime {
+		fn authorities() -> Vec<AuthorityDiscoveryId> {
+			// TODO and to fix
+			//AuthorityDiscovery::authorities()
+			Vec::new()
+		}
+	}
+
 	impl parachain::ParachainHost<Block> for Runtime {
 		fn validators() -> Vec<parachain::ValidatorId> {
 			Parachains::authorities()

service/src/grandpa_support.rs

@@ -23,7 +23,7 @@ use sp_runtime::traits::{Block as BlockT, NumberFor};
 /// same last finalized block) after a given block at height `N` has been
 /// finalized and for a delay of `M` blocks, i.e. until the best block reaches
 /// `N` + `M`, the voter will keep voting for block `N`.
-pub(crate) struct PauseAfterBlockFor<N>(pub(crate) N, pub(crate) N);
+pub struct PauseAfterBlockFor<N>(pub N, pub N);
 
 impl<Block, B> grandpa::VotingRule<Block, B> for PauseAfterBlockFor<NumberFor<Block>> where
 	Block: BlockT,
@@ -96,7 +96,7 @@ impl<Block, B> grandpa::VotingRule<Block, B> for PauseAfterBlockFor<NumberFor<Bl
 /// intermediary pending changes are replaced with a static list comprised of
 /// w3f validators and randomly selected validators from the latest session (at
 /// #1500988).
-pub(crate) fn kusama_hard_forks() -> Vec<(
+pub fn kusama_hard_forks() -> Vec<(
 	grandpa_primitives::SetId,
 	(Hash, polkadot_primitives::BlockNumber),
 	grandpa_primitives::AuthorityList,

service/src/lib.rs

@@ -17,7 +17,7 @@
 //! Polkadot service. Specialized wrapper over substrate service.
 
 pub mod chain_spec;
-mod grandpa_support;
+pub mod grandpa_support;
 mod client;
 
 use std::sync::Arc;
@@ -51,6 +51,8 @@ pub use codec::Codec;
 pub use polkadot_runtime;
 pub use kusama_runtime;
 pub use westend_runtime;
+#[cfg(feature = "test")]
+pub use polkadot_test_runtime;
 use prometheus_endpoint::Registry;
 pub use self::client::PolkadotClient;
 
@@ -136,7 +138,7 @@ impl IdentifyVariant for Box<dyn ChainSpec> {
 }
 
 // If we're using prometheus, use a registry with a prefix of `polkadot`.
-fn set_prometheus_registry(config: &mut Configuration) -> Result<(), ServiceError> {
+pub fn set_prometheus_registry(config: &mut Configuration) -> Result<(), ServiceError> {
 	if let Some(PrometheusConfig { registry, .. }) = config.prometheus_config.as_mut() {
 		*registry = Registry::new_custom(Some("polkadot".into()), None)?;
 	}
@@ -148,9 +150,10 @@ fn set_prometheus_registry(config: &mut Configuration) -> Result<(), ServiceErro
 ///
 /// Use this macro if you don't actually need the full service, but just the builder in order to
 /// be able to perform chain operations.
+#[macro_export]
 macro_rules! new_full_start {
 	($config:expr, $runtime:ty, $executor:ty, $informant_prefix:expr $(,)?) => {{
-		set_prometheus_registry(&mut $config)?;
+		$crate::set_prometheus_registry(&mut $config)?;
 
 		let mut import_setup = None;
 		let mut rpc_setup = None;
@@ -552,7 +555,7 @@ macro_rules! new_full {
 #[macro_export]
 macro_rules! new_light {
 	($config:expr, $runtime:ty, $dispatch:ty) => {{
-		crate::set_prometheus_registry(&mut $config)?;
+		$crate::set_prometheus_registry(&mut $config)?;
 		let inherent_data_providers = inherents::InherentDataProviders::new();
 
 		ServiceBuilder::new_light::<Block, $runtime, $dispatch>($config)?