From f6f15b618ef211dc9e623a8ed96dd3a8bb449f9f Mon Sep 17 00:00:00 2001
From: kaiyu <35792093+Kayryu@users.noreply.github.com>
Date: Thu, 21 Mar 2019 20:57:20 +0800
Subject: [PATCH] Use local executor (#2054)

---
 substrate/Cargo.lock                   | 1 -
 substrate/node-template/Cargo.toml     | 1 -
 substrate/node-template/src/service.rs | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock
index 2301ef9100..7cc24ee1e5 100644
--- a/substrate/Cargo.lock
+++ b/substrate/Cargo.lock
@@ -1987,7 +1987,6 @@ dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex-literal 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "node-executor 0.1.0",
  "node-template-runtime 0.9.0",
  "parity-codec 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/substrate/node-template/Cargo.toml b/substrate/node-template/Cargo.toml
index b66fe0e7de..53874bb181 100644
--- a/substrate/node-template/Cargo.toml
+++ b/substrate/node-template/Cargo.toml
@@ -32,7 +32,6 @@ consensus = { package = "substrate-consensus-aura", path = "../core/consensus/au
 substrate-client = {  path = "../core/client" }
 basic-authorship = { package = "substrate-basic-authorship", path = "../core/basic-authorship" }
 node-template-runtime = { path = "runtime" }
-node-executor = { path = "../node/executor" }
 
 [build-dependencies]
 vergen = "3"
diff --git a/substrate/node-template/src/service.rs b/substrate/node-template/src/service.rs
index cffc30217b..aa1d25963b 100644
--- a/substrate/node-template/src/service.rs
+++ b/substrate/node-template/src/service.rs
@@ -12,7 +12,6 @@ use substrate_service::{
 	TaskExecutor,
 };
 use basic_authorship::ProposerFactory;
-use node_executor;
 use consensus::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra};
 use substrate_client as client;
 use primitives::{ed25519::Pair, Pair as PairT};
@@ -45,7 +44,7 @@ construct_service_factory! {
 		Block = Block,
 		RuntimeApi = RuntimeApi,
 		NetworkProtocol = NodeProtocol { |config| Ok(NodeProtocol::new()) },
-		RuntimeDispatch = node_executor::Executor,
+		RuntimeDispatch = Executor,
 		FullTransactionPoolApi = transaction_pool::ChainApi<client::Client<FullBackend<Self>, FullExecutor<Self>, Block, RuntimeApi>, Block>
 			{ |config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client))) },
 		LightTransactionPoolApi = transaction_pool::ChainApi<client::Client<LightBackend<Self>, LightExecutor<Self>, Block, RuntimeApi>, Block>