replace sc-consensus by meta-consensus

DeFiCh · Nov 21, 2022 · 9b75146 · 9b75146
1 parent 0b96233
commit 9b75146
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/meta/meta-node/Cargo.toml b/meta/meta-node/Cargo.toml
@@ -19,7 +19,6 @@ sc-basic-authorship             = { git = "https://github.com/paritytech/substra
 sc-cli                          = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
 sc-client-api                   = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
 sc-consensus                    = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
-sc-consensus-manual-seal        = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
 sc-executor                     = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
 sc-keystore                     = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
 sc-network                      = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.27" }
@@ -54,6 +53,7 @@ fp-evm							= { git = "https://github.com/paritytech/frontier.git", branch = "p
 fp-rpc							= { git = "https://github.com/paritytech/frontier.git", branch = "polkadot-v0.9.27" }
 fp-storage						= { git = "https://github.com/paritytech/frontier.git", branch = "polkadot-v0.9.27" }
 # local packages
+meta-consensus = { package = "meta-consensus", path = "../meta-consensus" }
 meta-runtime = { package = "meta-runtime", path = "../meta-runtime" }
 
 [build-dependencies]

diff --git a/meta/meta-node/src/rpc.rs b/meta/meta-node/src/rpc.rs
@@ -8,7 +8,7 @@ use sc_client_api::{
 	backend::{AuxStore, Backend, StateBackend, StorageProvider},
 	client::BlockchainEvents,
 };
-use sc_consensus_manual_seal::rpc::{ManualSeal, ManualSealApiServer};
+use meta_consensus::rpc::{ManualSeal, ManualSealApiServer};
 use sc_network::NetworkService;
 use sc_rpc::SubscriptionTaskExecutor;
 use sc_rpc_api::DenyUnsafe;
@@ -60,7 +60,7 @@ pub struct FullDeps<C, P, A: ChainApi> {
 	pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,
 	/// Manual seal command sink
 	pub command_sink:
-		Option<futures::channel::mpsc::Sender<sc_consensus_manual_seal::rpc::EngineCommand<Hash>>>,
+		Option<futures::channel::mpsc::Sender<meta_consensus::rpc::EngineCommand<Hash>>>,
 }
 
 pub fn overrides_handle<C, BE>(client: Arc<C>) -> Arc<OverrideHandle<Block>>

diff --git a/meta/meta-node/src/service.rs b/meta/meta-node/src/service.rs
@@ -156,7 +156,7 @@ pub fn new_partial(
 	let frontier_block_import =
 		FrontierBlockImport::new(client.clone(), client.clone(), frontier_backend.clone());
 
-	let import_queue = sc_consensus_manual_seal::import_queue(
+	let import_queue = meta_consensus::import_queue(
 		Box::new(client.clone()),
 		&task_manager.spawn_essential_handle(),
 		config.prometheus_registry(),
@@ -361,8 +361,8 @@ pub fn new_full(mut config: Configuration, cli: &Cli) -> Result<TaskManager, Ser
 		};
 
 		let manual_seal = match sealing {
-			Sealing::Manual => future::Either::Left(sc_consensus_manual_seal::run_manual_seal(
-				sc_consensus_manual_seal::ManualSealParams {
+			Sealing::Manual => future::Either::Left(meta_consensus::run_manual_seal(
+				meta_consensus::ManualSealParams {
 					block_import,
 					env,
 					client,
@@ -373,8 +373,8 @@ pub fn new_full(mut config: Configuration, cli: &Cli) -> Result<TaskManager, Ser
 					create_inherent_data_providers,
 				},
 			)),
-			Sealing::Instant => future::Either::Right(sc_consensus_manual_seal::run_instant_seal(
-				sc_consensus_manual_seal::InstantSealParams {
+			Sealing::Instant => future::Either::Right(meta_consensus::run_instant_seal(
+				meta_consensus::InstantSealParams {
 					block_import,
 					env,
 					client,