Rewrite Inherent data (#1488)

* Implement new inherent data

* Fixes compilation on wasm

* Fixes after rebase

* Switch back to generate inherent stuff by macro

* Update after rebase

* Apply suggestions from code review

Co-Authored-By: bkchr <bkchr@users.noreply.github.com>

* Fix compilation after rebase

* Address grumbles

* Remove `InherentDataProviders` from `Client`

* Update wasm files after rebase

* Address grumbles

* Fixes compilation after latest merge

* Last fix

substrate/core/service/src/chain_ops.rs

@@ -32,7 +32,14 @@ use error;
 use chain_spec::ChainSpec;
 
 /// Export a range of blocks to a binary stream.
-pub fn export_blocks<F, E, W>(config: FactoryFullConfiguration<F>, exit: E, mut output: W, from: FactoryBlockNumber<F>, to: Option<FactoryBlockNumber<F>>, json: bool) -> error::Result<()>
+pub fn export_blocks<F, E, W>(
+	config: FactoryFullConfiguration<F>,
+	exit: E,
+	mut output: W,
+	from: FactoryBlockNumber<F>,
+	to: Option<FactoryBlockNumber<F>>,
+	json: bool
+) -> error::Result<()>
 	where
 	F: ServiceFactory,
 	E: Future<Item=(),Error=()> + Send + 'static,
@@ -68,7 +75,8 @@ pub fn export_blocks<F, E, W>(config: FactoryFullConfiguration<F>, exit: E, mut
 		match client.block(&BlockId::number(block))? {
 			Some(block) => {
 				if json {
-					serde_json::to_writer(&mut output, &block).map_err(|e| format!("Eror writing JSON: {}", e))?;
+					serde_json::to_writer(&mut output, &block)
+						.map_err(|e| format!("Eror writing JSON: {}", e))?;
 				} else {
 					output.write(&block.encode())?;
 				}
@@ -87,7 +95,11 @@ pub fn export_blocks<F, E, W>(config: FactoryFullConfiguration<F>, exit: E, mut
 }
 
 /// Import blocks from a binary stream.
-pub fn import_blocks<F, E, R>(mut config: FactoryFullConfiguration<F>, exit: E, mut input: R) -> error::Result<()>
+pub fn import_blocks<F, E, R>(
+	mut config: FactoryFullConfiguration<F>,
+	exit: E,
+	mut input: R
+) -> error::Result<()>
 	where F: ServiceFactory, E: Future<Item=(),Error=()> + Send + 'static, R: Read,
 {
 	struct DummyLink;
@@ -148,7 +160,10 @@ pub fn import_blocks<F, E, R>(mut config: FactoryFullConfiguration<F>, exit: E,
 }
 
 /// Revert the chain.
-pub fn revert_chain<F>(config: FactoryFullConfiguration<F>, blocks: FactoryBlockNumber<F>) -> error::Result<()>
+pub fn revert_chain<F>(
+	config: FactoryFullConfiguration<F>,
+	blocks: FactoryBlockNumber<F>
+) -> error::Result<()>
 	where F: ServiceFactory,
 {
 	let client = new_client::<F>(&config)?;

substrate/core/service/src/components.rs

@@ -27,7 +27,9 @@ use consensus_common::import_queue::ImportQueue;
 use network::{self, OnDemand};
 use substrate_executor::{NativeExecutor, NativeExecutionDispatch};
 use transaction_pool::txpool::{self, Options as TransactionPoolOptions, Pool as TransactionPool};
-use runtime_primitives::{BuildStorage, traits::{Block as BlockT, Header as HeaderT, ProvideRuntimeApi}, generic::BlockId};
+use runtime_primitives::{
+	BuildStorage, traits::{Block as BlockT, Header as HeaderT, ProvideRuntimeApi}, generic::BlockId
+};
 use config::Configuration;
 use primitives::{Blake2Hasher, H256};
 use rpc::{self, apis::system::SystemInfo};

substrate/core/service/src/error.rs

@@ -19,6 +19,7 @@
 use client;
 use network;
 use keystore;
+use consensus_common;
 
 error_chain! {
 	foreign_links {
@@ -27,6 +28,7 @@ error_chain! {
 
 	links {
 		Client(client::error::Error, client::error::ErrorKind) #[doc="Client error"];
+		Consensus(consensus_common::Error, consensus_common::ErrorKind) #[doc="Consesus error"];
 		Network(network::error::Error, network::error::ErrorKind) #[doc="Network error"];
 		Keystore(keystore::Error, keystore::ErrorKind) #[doc="Keystore error"];
 	}

substrate/core/service/src/lib.rs

@@ -77,7 +77,9 @@ use codec::{Encode, Decode};
 pub use self::error::{ErrorKind, Error};
 pub use config::{Configuration, Roles, PruningMode};
 pub use chain_spec::{ChainSpec, Properties};
-pub use transaction_pool::txpool::{self, Pool as TransactionPool, Options as TransactionPoolOptions, ChainApi, IntoPoolError};
+pub use transaction_pool::txpool::{
+	self, Pool as TransactionPool, Options as TransactionPoolOptions, ChainApi, IntoPoolError
+};
 pub use client::{ExecutionStrategy, FinalityNotifications};
 
 pub use components::{ServiceFactory, FullBackend, FullExecutor, LightBackend,
@@ -294,7 +296,8 @@ impl<Components: components::Components> Service<Components> {
 			properties: config.chain_spec.properties(),
 		};
 		let rpc = Components::RPC::start_rpc(
-			client.clone(), network.clone(), has_bootnodes, system_info, config.rpc_http, config.rpc_ws, task_executor.clone(), transaction_pool.clone(),
+			client.clone(), network.clone(), has_bootnodes, system_info, config.rpc_http,
+			config.rpc_ws, task_executor.clone(), transaction_pool.clone(),
 		)?;
 
 		// Telemetry
@@ -392,8 +395,8 @@ impl<Components> Drop for Service<Components> where Components: components::Comp
 	}
 }
 
-fn maybe_start_server<T, F>(address: Option<SocketAddr>, start: F) -> Result<Option<T>, io::Error> where
-	F: Fn(&SocketAddr) -> Result<T, io::Error>,
+fn maybe_start_server<T, F>(address: Option<SocketAddr>, start: F) -> Result<Option<T>, io::Error>
+	where F: Fn(&SocketAddr) -> Result<T, io::Error>,
 {
 	Ok(match address {
 		Some(mut address) => Some(start(&address)
@@ -428,7 +431,9 @@ impl<C: Components> TransactionPoolAdapter<C> {
 	}
 }
 
-impl<C: Components> network::TransactionPool<ComponentExHash<C>, ComponentBlock<C>> for TransactionPoolAdapter<C> where <C as components::Components>::RuntimeApi: Send + Sync{
+impl<C: Components> network::TransactionPool<ComponentExHash<C>, ComponentBlock<C>> for
+	TransactionPoolAdapter<C> where <C as components::Components>::RuntimeApi: Send + Sync
+{
 	fn transactions(&self) -> Vec<(ComponentExHash<C>, ComponentExtrinsic<C>)> {
 		self.pool.ready()
 			.map(|t| {