Remove node-api (#804)

* Remove `node-api` from `node-consensus` and `node-transaction-pool`

* Remove the `node-api` crate and its last usages

* Remove left over file

* Fixes compilation errors

* Switch to `As` trait

* Rename trait

* Whitespace

substrate/node/consensus/src/service.rs

@@ -26,16 +26,16 @@ use bft::{self, BftService};
 use client::{BlockchainEvents, ChainHead, BlockBody};
 use ed25519;
 use futures::prelude::*;
-use node_api::Api;
-use node_primitives::{Block, Header};
-use transaction_pool::TransactionPool;
+use transaction_pool::{TransactionPool, Client as TPClient};
+use primitives;
+use runtime_primitives::traits::{Block as BlockT, Header as HeaderT};
 
 use tokio::executor::current_thread::TaskExecutor as LocalThreadHandle;
 use tokio::runtime::TaskExecutor as ThreadPoolHandle;
 use tokio::runtime::current_thread::Runtime as LocalRuntime;
 use tokio::timer::Interval;
 
-use super::{Network, ProposerFactory};
+use super::{Network, ProposerFactory, AuthoringApi};
 use error;
 
 const TIMER_DELAY_MS: u64 = 5000;
@@ -43,15 +43,16 @@ const TIMER_INTERVAL_MS: u64 = 500;
 
 // spin up an instance of BFT agreement on the current thread's executor.
 // panics if there is no current thread executor.
-fn start_bft<F, C>(
-	header: Header,
+fn start_bft<F, C, Block>(
+	header: <Block as BlockT>::Header,
 	bft_service: Arc<BftService<Block, F, C>>,
 ) where
 	F: bft::Environment<Block> + 'static,
 	C: bft::BlockImport<Block> + bft::Authorities<Block> + 'static,
 	F::Error: ::std::fmt::Debug,
 	<F::Proposer as bft::Proposer<Block>>::Error: ::std::fmt::Display + Into<error::Error>,
-	<F as bft::Environment<Block>>::Error: ::std::fmt::Display
+	<F as bft::Environment<Block>>::Error: ::std::fmt::Display,
+	Block: BlockT,
 {
 	let mut handle = LocalThreadHandle::current();
 	match bft_service.build_upon(&header) {
@@ -80,10 +81,15 @@ impl Service {
 		key: ed25519::Pair,
 	) -> Service
 		where
-			A: Api + Send + Sync + 'static,
-			C: BlockchainEvents<Block> + ChainHead<Block> + BlockBody<Block>,
-			C: bft::BlockImport<Block> + bft::Authorities<Block> + Send + Sync + 'static,
-			N: Network + Send + 'static,
+			A: AuthoringApi + TPClient<Block = <A as AuthoringApi>::Block> + 'static,
+			C: BlockchainEvents<<A as AuthoringApi>::Block>
+				+ ChainHead<<A as AuthoringApi>::Block>
+				+ BlockBody<<A as AuthoringApi>::Block>,
+			C: bft::BlockImport<<A as AuthoringApi>::Block>
+				+ bft::Authorities<<A as AuthoringApi>::Block> + Send + Sync + 'static,
+			primitives::H256: From<<<A as AuthoringApi>::Block as BlockT>::Hash>,
+			<<A as AuthoringApi>::Block as BlockT>::Hash: PartialEq<primitives::H256> + PartialEq,
+			N: Network<Block = <A as AuthoringApi>::Block> + Send + 'static,
 	{
 		use parking_lot::RwLock;
 		use super::OfflineTracker;