Use FullGrandpaBlockImport for Pangolin (#601)

* Remove frontier block import * Handle conflic
darwinia-network · Apr 23, 2021 · e52046b · e52046b
1 parent 4d16da0
commit e52046b
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 208 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,6 @@ members = [
 	"bin/node/primitives",
 	"bin/node/runtime/pangolin",
 	"client/cli",
-	"client/dvm/consensus",
 	"client/dvm/db",
 	"client/dvm/mapping-sync",
 	"client/dvm/rpc",

diff --git a/bin/node/cli/Cargo.toml b/bin/node/cli/Cargo.toml
@@ -36,7 +36,6 @@ darwinia-header-mmr-rpc-runtime-api = { path = "../../../frame/header-mmr/rpc/ru
 darwinia-staking                    = { path = "../../../frame/staking" }
 darwinia-staking-rpc                = { path = "../../../frame/staking/rpc" }
 darwinia-staking-rpc-runtime-api    = { path = "../../../frame/staking/rpc/runtime-api" }
-dc-consensus                        = { path = "../../../client/dvm/consensus" }
 dc-db                               = { path = "../../../client/dvm/db" }
 dc-mapping-sync                     = { path = "../../../client/dvm/mapping-sync" }
 dc-rpc                              = { path = "../../../client/dvm/rpc", features = ["rpc_binary_search_estimate"] }

diff --git a/bin/node/cli/src/service.rs b/bin/node/cli/src/service.rs
@@ -67,7 +67,6 @@ use crate::rpc::{
 	self, BabeDeps, DenyUnsafe, FullDeps, GrandpaDeps, LightDeps, RpcExtension,
 	SubscriptionTaskExecutor,
 };
-use dc_consensus::FrontierBlockImport;
 use dc_db::{Backend, DatabaseSettings, DatabaseSettingsSrc};
 use dc_mapping_sync::MappingSyncWorker;
 use dc_rpc::EthTask;
@@ -214,11 +213,7 @@ fn new_partial<RuntimeApi, Executor>(
 				BabeBlockImport<
 					Block,
 					FullClient<RuntimeApi, Executor>,
-					FrontierBlockImport<
-						Block,
-						FullGrandpaBlockImport<RuntimeApi, Executor>,
-						FullClient<RuntimeApi, Executor>,
-					>,
+					FullGrandpaBlockImport<RuntimeApi, Executor>,
 				>,
 				LinkHalf<Block, FullClient<RuntimeApi, Executor>, FullSelectChain>,
 				BabeLink<Block>,
@@ -287,14 +282,9 @@ where
 			telemetry.as_ref().map(|x| x.handle()),
 		)?;
 	let justification_import = grandpa_block_import.clone();
-	let frontier_block_import = FrontierBlockImport::new(
-		grandpa_block_import.clone(),
-		client.clone(),
-		frontier_backend.clone(),
-	);
 	let (babe_import, babe_link) = sc_consensus_babe::block_import(
 		BabeConfig::get_or_compute(&*client)?,
-		frontier_block_import,
+		grandpa_block_import,
 		client.clone(),
 	)?;
 	let import_queue = sc_consensus_babe::import_queue(

diff --git a/client/dvm/consensus/Cargo.toml b/client/dvm/consensus/Cargo.toml
diff --git a/client/dvm/consensus/src/lib.rs b/client/dvm/consensus/src/lib.rs
diff --git a/client/dvm/mapping-sync/Cargo.toml b/client/dvm/mapping-sync/Cargo.toml
@@ -16,7 +16,6 @@ sp-api        = { git = "https://github.com/darwinia-network/substrate.git", tag
 sp-blockchain = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
 sp-runtime    = { git = "https://github.com/darwinia-network/substrate.git", tag = "darwinia-v0.10.0" }
 # darwinia
-dc-consensus        = { path = "../consensus" }
 dc-db               = { path = "../db" }
 dp_consensus        = { path = "../../../primitives/consensus/" }
 dvm-rpc-runtime-api = { path = "../../../frame/dvm/rpc/runtime-api" }

diff --git a/client/dvm/rpc/Cargo.toml b/client/dvm/rpc/Cargo.toml
@@ -27,7 +27,6 @@ rand                = { version = "0.7" }
 rlp                 = { version = "0.5.0" }
 sha3                = { version = "0.8" }
 # darwinia
-dc-consensus        = { path = "../consensus" }
 dc-db               = { path = "../db" }
 dp-rpc              = { path = "../../../primitives/rpc" }
 dp-storage          = { path = "../../../primitives/storage/" }