Remove node-service (#933)

* Move `chain_spec` into `node-cli`

* Fixes tests

* Adds `construct_simple_service` and `construct_service_factory` macros

* Remove the `node-service` crate

* Add some documentation

* Fixes compilation on stable

substrate/node/cli/src/chain_spec.rs

@@ -0,0 +1,270 @@
+// Copyright 2018 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/>.
+
+//! Substrate chain configurations.
+
+use primitives::{AuthorityId, ed25519};
+use node_runtime::{GenesisConfig, ConsensusConfig, CouncilSeatsConfig, CouncilVotingConfig, DemocracyConfig,
+	SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, TreasuryConfig,
+	ContractConfig, Permill, Perbill};
+use substrate_service;
+
+const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
+
+/// Specialised `ChainSpec`.
+pub type ChainSpec = substrate_service::ChainSpec<GenesisConfig>;
+
+pub fn bbq_birch_config() -> Result<ChainSpec, String> {
+	ChainSpec::from_embedded(include_bytes!("../res/bbq-birch.json"))
+}
+
+fn staging_testnet_config_genesis() -> GenesisConfig {
+	let initial_authorities = vec![
+		hex!["82c39b31a2b79a90f8e66e7a77fdb85a4ed5517f2ae39f6a80565e8ecae85cf5"].into(),
+		hex!["4de37a07567ebcbf8c64568428a835269a566723687058e017b6d69db00a77e7"].into(),
+		hex!["063d7787ebca768b7445dfebe7d62cbb1625ff4dba288ea34488da266dd6dca5"].into(),
+		hex!["8101764f45778d4980dadaceee6e8af2517d3ab91ac9bec9cd1714fa5994081c"].into(),
+	];
+	let endowed_accounts = vec![
+		hex!["f295940fa750df68a686fcf4abd4111c8a9c5a5a5a83c4c8639c451a94a7adfd"].into(),
+	];
+	const MILLICENTS: u128 = 1_000_000_000;
+	const CENTS: u128 = 1_000 * MILLICENTS;	// assume this is worth about a cent.
+	const DOLLARS: u128 = 100 * CENTS;
+
+	const SECS_PER_BLOCK: u64 = 5;
+	const MINUTES: u64 = 60 / SECS_PER_BLOCK;
+	const HOURS: u64 = MINUTES * 60;
+	const DAYS: u64 = HOURS * 24;
+
+	GenesisConfig {
+		consensus: Some(ConsensusConfig {
+			code: include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm").to_vec(),	// TODO change
+			authorities: initial_authorities.clone(),
+		}),
+		system: None,
+		balances: Some(BalancesConfig {
+			balances: endowed_accounts.iter().map(|&k|(k, 10_000_000 * DOLLARS)).collect(),
+			transaction_base_fee: 1 * CENTS,
+			transaction_byte_fee: 10 * MILLICENTS,
+			existential_deposit: 1 * DOLLARS,
+			transfer_fee: 1 * CENTS,
+			creation_fee: 1 * CENTS,
+			reclaim_rebate: 1 * CENTS,
+		}),
+		session: Some(SessionConfig {
+			validators: initial_authorities.iter().cloned().map(Into::into).collect(),
+			session_length: 5 * MINUTES
+		}),
+		staking: Some(StakingConfig {
+			current_era: 0,
+			intentions: initial_authorities.iter().cloned().map(Into::into).collect(),
+			offline_slash: Perbill::from_billionths(1_000_000),
+			session_reward: Perbill::from_billionths(2_065),
+			current_offline_slash: 0,
+			current_session_reward: 0,
+			validator_count: 7,
+			sessions_per_era: 12,
+			bonding_duration: 1 * DAYS,
+			offline_slash_grace: 4,
+			minimum_validator_count: 4,
+		}),
+		democracy: Some(DemocracyConfig {
+			launch_period: 5 * MINUTES,	// 1 day per public referendum
+			voting_period: 5 * MINUTES,	// 3 days to discuss & vote on an active referendum
+			minimum_deposit: 50 * DOLLARS,	// 12000 as the minimum deposit for a referendum
+		}),
+		council_seats: Some(CouncilSeatsConfig {
+			active_council: vec![],
+			candidacy_bond: 10 * DOLLARS,
+			voter_bond: 1 * DOLLARS,
+			present_slash_per_voter: 1 * CENTS,
+			carry_count: 6,
+			presentation_duration: 1 * DAYS,
+			approval_voting_period: 2 * DAYS,
+			term_duration: 28 * DAYS,
+			desired_seats: 0,
+			inactive_grace_period: 1,	// one additional vote should go by before an inactive voter can be reaped.
+
+		}),
+		council_voting: Some(CouncilVotingConfig {
+			cooloff_period: 4 * DAYS,
+			voting_period: 1 * DAYS,
+		}),
+		timestamp: Some(TimestampConfig {
+			period: SECS_PER_BLOCK,
+		}),
+		treasury: Some(TreasuryConfig {
+			proposal_bond: Permill::from_percent(5),
+			proposal_bond_minimum: 1 * DOLLARS,
+			spend_period: 1 * DAYS,
+			burn: Permill::from_percent(50),
+		}),
+		contract: Some(ContractConfig {
+			contract_fee: 1 * CENTS,
+			call_base_fee: 1000,
+			create_base_fee: 1000,
+			gas_price: 1 * MILLICENTS,
+			max_depth: 1024,
+			block_gas_limit: 10_000_000,
+		}),
+	}
+}
+
+/// Staging testnet config.
+pub fn staging_testnet_config() -> ChainSpec {
+	let boot_nodes = vec![
+	];
+	ChainSpec::from_genesis(
+		"Staging Testnet",
+		"staging_testnet",
+		staging_testnet_config_genesis,
+		boot_nodes,
+		Some(STAGING_TELEMETRY_URL.into()),
+		None,
+		None,
+	)
+}
+
+fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
+	let endowed_accounts = vec![
+		ed25519::Pair::from_seed(b"Alice                           ").public().0.into(),
+		ed25519::Pair::from_seed(b"Bob                             ").public().0.into(),
+		ed25519::Pair::from_seed(b"Charlie                         ").public().0.into(),
+		ed25519::Pair::from_seed(b"Dave                            ").public().0.into(),
+		ed25519::Pair::from_seed(b"Eve                             ").public().0.into(),
+		ed25519::Pair::from_seed(b"Ferdie                          ").public().0.into(),
+	];
+	GenesisConfig {
+		consensus: Some(ConsensusConfig {
+			code: include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm").to_vec(),
+			authorities: initial_authorities.clone(),
+		}),
+		system: None,
+		balances: Some(BalancesConfig {
+			transaction_base_fee: 1,
+			transaction_byte_fee: 0,
+			existential_deposit: 500,
+			transfer_fee: 0,
+			creation_fee: 0,
+			reclaim_rebate: 0,
+			balances: endowed_accounts.iter().map(|&k|(k, (1 << 60))).collect(),
+		}),
+		session: Some(SessionConfig {
+			validators: initial_authorities.iter().cloned().map(Into::into).collect(),
+			session_length: 10,
+		}),
+		staking: Some(StakingConfig {
+			current_era: 0,
+			intentions: initial_authorities.iter().cloned().map(Into::into).collect(),
+			minimum_validator_count: 1,
+			validator_count: 2,
+			sessions_per_era: 5,
+			bonding_duration: 2 * 60 * 12,
+			offline_slash: Perbill::zero(),
+			session_reward: Perbill::zero(),
+			current_offline_slash: 0,
+			current_session_reward: 0,
+			offline_slash_grace: 0,
+		}),
+		democracy: Some(DemocracyConfig {
+			launch_period: 9,
+			voting_period: 18,
+			minimum_deposit: 10,
+		}),
+		council_seats: Some(CouncilSeatsConfig {
+			active_council: endowed_accounts.iter()
+				.filter(|a| initial_authorities.iter().find(|&b| a.0 == b.0).is_none())
+				.map(|a| (a.clone(), 1000000)).collect(),
+			candidacy_bond: 10,
+			voter_bond: 2,
+			present_slash_per_voter: 1,
+			carry_count: 4,
+			presentation_duration: 10,
+			approval_voting_period: 20,
+			term_duration: 1000000,
+			desired_seats: (endowed_accounts.len() - initial_authorities.len()) as u32,
+			inactive_grace_period: 1,
+		}),
+		council_voting: Some(CouncilVotingConfig {
+			cooloff_period: 75,
+			voting_period: 20,
+		}),
+		timestamp: Some(TimestampConfig {
+			period: 5,					// 5 second block time.
+		}),
+		treasury: Some(TreasuryConfig {
+			proposal_bond: Permill::from_percent(5),
+			proposal_bond_minimum: 1_000_000,
+			spend_period: 12 * 60 * 24,
+			burn: Permill::from_percent(50),
+		}),
+		contract: Some(ContractConfig {
+			contract_fee: 21,
+			call_base_fee: 135,
+			create_base_fee: 175,
+			gas_price: 1,
+			max_depth: 1024,
+			block_gas_limit: 10_000_000,
+		}),
+	}
+}
+
+fn development_config_genesis() -> GenesisConfig {
+	testnet_genesis(vec![
+		ed25519::Pair::from_seed(b"Alice                           ").public().into(),
+	])
+}
+
+/// Development config (single validator Alice)
+pub fn development_config() -> ChainSpec {
+	ChainSpec::from_genesis("Development", "development", development_config_genesis, vec![], None, None, None)
+}
+
+fn local_testnet_genesis() -> GenesisConfig {
+	testnet_genesis(vec![
+		ed25519::Pair::from_seed(b"Alice                           ").public().into(),
+		ed25519::Pair::from_seed(b"Bob                             ").public().into(),
+	])
+}
+
+/// Local testnet config (multivalidator Alice + Bob)
+pub fn local_testnet_config() -> ChainSpec {
+	ChainSpec::from_genesis("Local Testnet", "local_testnet", local_testnet_genesis, vec![], None, None, None)
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+	use service_test;
+	use service::Factory;
+
+	fn local_testnet_genesis_instant() -> GenesisConfig {
+		let mut genesis = local_testnet_genesis();
+		genesis.timestamp = Some(TimestampConfig { period: 0 });
+		genesis
+	}
+
+	/// Local testnet config (multivalidator Alice + Bob)
+	pub fn integration_test_config() -> ChainSpec {
+		ChainSpec::from_genesis("Integration Test", "test", local_testnet_genesis_instant, vec![], None, None, None)
+	}
+
+	#[test]
+	fn test_connectivity() {
+		service_test::connectivity::<Factory>(integration_test_config());
+	}
+}

substrate/node/cli/src/lib.rs

@@ -22,17 +22,32 @@
 extern crate tokio;
 
 extern crate substrate_cli as cli;
-extern crate node_service as service;
+extern crate substrate_primitives as primitives;
+extern crate node_runtime;
 extern crate exit_future;
+#[macro_use]
+extern crate hex_literal;
+#[cfg(test)]
+extern crate substrate_service_test as service_test;
+extern crate substrate_transaction_pool as transaction_pool;
+extern crate substrate_network as network;
+extern crate node_network;
+extern crate sr_primitives as runtime_primitives;
+extern crate node_primitives;
+#[macro_use]
+extern crate substrate_service;
+extern crate node_executor;
 
 #[macro_use]
 extern crate log;
 
 pub use cli::error;
+mod chain_spec;
+mod service;
 
 use tokio::runtime::Runtime;
-pub use service::{Components as ServiceComponents, Service, CustomConfiguration, ServiceFactory};
 pub use cli::{VersionInfo, IntoExit};
+use substrate_service::{ServiceFactory, Roles as ServiceRoles};
 
 /// The chain specification option.
 #[derive(Clone, Debug)]
@@ -49,12 +64,12 @@ pub enum ChainSpec {
 
 /// Get a chain config from a spec setting.
 impl ChainSpec {
-	pub(crate) fn load(self) -> Result<service::ChainSpec, String> {
+	pub(crate) fn load(self) -> Result<chain_spec::ChainSpec, String> {
 		Ok(match self {
-			ChainSpec::BbqBirch => service::chain_spec::bbq_birch_config()?,
-			ChainSpec::Development => service::chain_spec::development_config(),
-			ChainSpec::LocalTestnet => service::chain_spec::local_testnet_config(),
-			ChainSpec::StagingTestnet => service::chain_spec::staging_testnet_config(),
+			ChainSpec::BbqBirch => chain_spec::bbq_birch_config()?,
+			ChainSpec::Development => chain_spec::development_config(),
+			ChainSpec::LocalTestnet => chain_spec::local_testnet_config(),
+			ChainSpec::StagingTestnet => chain_spec::staging_testnet_config(),
 		})
 	}
 
@@ -69,7 +84,7 @@ impl ChainSpec {
 	}
 }
 
-fn load_spec(id: &str) -> Result<Option<service::ChainSpec>, String> {
+fn load_spec(id: &str) -> Result<Option<chain_spec::ChainSpec>, String> {
 	Ok(match ChainSpec::from(id) {
 		Some(spec) => Some(spec.load()?),
 		None => None,
@@ -93,7 +108,7 @@ pub fn run<I, T, E>(args: I, exit: E, version: cli::VersionInfo) -> error::Resul
 			info!("Roles: {:?}", config.roles);
 			let mut runtime = Runtime::new()?;
 			let executor = runtime.executor();
-			match config.roles == service::Roles::LIGHT {
+			match config.roles == ServiceRoles::LIGHT {
 				true => run_until_exit(&mut runtime, service::Factory::new_light(config, executor)?, exit)?,
 				false => run_until_exit(&mut runtime, service::Factory::new_full(config, executor)?, exit)?,
 			}
@@ -108,7 +123,7 @@ fn run_until_exit<C, E>(
 	e: E,
 ) -> error::Result<()>
 	where
-		C: service::Components,
+		C: substrate_service::Components,
 		E: IntoExit,
 {
 	let (exit_send, exit) = exit_future::signal();

substrate/node/cli/src/service.rs

@@ -0,0 +1,133 @@
+// Copyright 2018 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/>.
+
+#![warn(unused_extern_crates)]
+
+//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
+
+use std::sync::Arc;
+use transaction_pool::{self, txpool::{Pool as TransactionPool}};
+use node_primitives::Block;
+use node_runtime::GenesisConfig;
+use node_network::Protocol as DemoProtocol;
+use substrate_service::{
+	FactoryFullConfiguration, LightComponents, FullComponents, FullBackend,
+	LightBackend, FullExecutor, LightExecutor
+};
+use network::import_queue::{BasicQueue, BlockOrigin, ImportBlock, Verifier};
+use runtime_primitives::{traits::Block as BlockT};
+use primitives::AuthorityId;
+use node_executor;
+
+// TODO: Remove me, when we have a functional consensus.
+/// A verifier that doesn't actually do any checks
+pub struct NoneVerifier;
+/// This Verifiyer accepts all data as valid
+impl<B: BlockT> Verifier<B> for NoneVerifier {
+	fn verify(
+		&self,
+		origin: BlockOrigin,
+		header: B::Header,
+		justification: Vec<u8>,
+		body: Option<Vec<B::Extrinsic>>
+	) -> Result<(ImportBlock<B>, Option<Vec<AuthorityId>>), String> {
+		Ok((ImportBlock {
+			origin,
+			header,
+			body,
+			finalized: true,
+			external_justification: justification,
+			internal_justification: vec![],
+			auxiliary: Vec::new(),
+		}, None))
+	}
+}
+
+construct_simple_service!(Service);
+
+construct_service_factory! {
+	struct Factory {
+		Block = Block,
+		NetworkProtocol = DemoProtocol { |config| Ok(DemoProtocol::new()) },
+		RuntimeDispatch = node_executor::Executor,
+		FullTransactionPoolApi = transaction_pool::ChainApi<FullBackend<Self>, FullExecutor<Self>, Block>
+			{ |config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client))) },
+		LightTransactionPoolApi = transaction_pool::ChainApi<LightBackend<Self>, LightExecutor<Self>, Block>
+			{ |config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client))) },
+		Genesis = GenesisConfig,
+		Configuration = (),
+		FullService = Service<FullComponents<Self>>
+			{ |config, executor| Service::<FullComponents<Factory>>::new(config, executor) },
+		LightService = Service<LightComponents<Self>>
+			{ |config, executor| Service::<LightComponents<Factory>>::new(config, executor) },
+		ImportQueue = BasicQueue<Block, NoneVerifier>
+			{ |_, _| Ok(BasicQueue::new(Arc::new(NoneVerifier {}))) }
+			{ |_, _| Ok(BasicQueue::new(Arc::new(NoneVerifier {}))) },
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	#[cfg(feature = "rhd")]
+	fn test_sync() {
+		use {service_test, Factory};
+		use client::{ImportBlock, BlockOrigin};
+
+		let alice: Arc<ed25519::Pair> = Arc::new(Keyring::Alice.into());
+		let bob: Arc<ed25519::Pair> = Arc::new(Keyring::Bob.into());
+		let validators = vec![alice.public().0.into(), bob.public().0.into()];
+		let keys: Vec<&ed25519::Pair> = vec![&*alice, &*bob];
+		let offline = Arc::new(RwLock::new(OfflineTracker::new()));
+		let dummy_runtime = ::tokio::runtime::Runtime::new().unwrap();
+		let block_factory = |service: &<Factory as service::ServiceFactory>::FullService| {
+			let block_id = BlockId::number(service.client().info().unwrap().chain.best_number);
+			let parent_header = service.client().header(&block_id).unwrap().unwrap();
+			let consensus_net = ConsensusNetwork::new(service.network(), service.client().clone());
+			let proposer_factory = consensus::ProposerFactory {
+				client: service.client().clone(),
+				transaction_pool: service.transaction_pool().clone(),
+				network: consensus_net,
+				offline: offline.clone(),
+				force_delay: 0,
+				handle: dummy_runtime.executor(),
+			};
+			let (proposer, _, _) = proposer_factory.init(&parent_header, &validators, alice.clone()).unwrap();
+			let block = proposer.propose().expect("Error making test block");
+			ImportBlock {
+				origin: BlockOrigin::File,
+				external_justification: Vec::new(),
+				internal_justification: Vec::new(),
+				finalized: true,
+				body: Some(block.extrinsics),
+				header: block.header,
+				auxiliary: Vec::new(),
+			}
+		};
+		let extrinsic_factory = |service: &<Factory as service::ServiceFactory>::FullService| {
+			let payload = (0, Call::Balances(BalancesCall::transfer(RawAddress::Id(bob.public().0.into()), 69.into())), Era::immortal(), service.client().genesis_hash());
+			let signature = alice.sign(&payload.encode()).into();
+			let id = alice.public().0.into();
+			let xt = UncheckedExtrinsic {
+				signature: Some((RawAddress::Id(id), signature, payload.0, Era::immortal())),
+				function: payload.1,
+			}.encode();
+			let v: Vec<u8> = Decode::decode(&mut xt.as_slice()).unwrap();
+			OpaqueExtrinsic(v)
+		};
+		service_test::sync::<Factory, _, _>(chain_spec::integration_test_config(), block_factory, extrinsic_factory);
+	}
+
+}