build dev consensus

Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com>

node/src/builder.rs

@@ -22,6 +22,7 @@ use crate::{
     instant_finalize::InstantFinalizeBlockImport,
     service::{Client, StateBackend, TransactionPool},
 };
+use std::future::Future;
 
 pub use manta_primitives::types::{AccountId, Balance, Block, Hash, Header, Index as Nonce};
 use polkadot_service::CollatorPair;
@@ -144,14 +145,14 @@ where
     }))
 }
 
-/// start standalone dev consensus
-pub fn start_dev_nimbus_instant_seal_consensus<RuntimeApi>(
+/// build standalone mode dev consensus using manual instant seal
+pub fn build_dev_nimbus_consensus<RuntimeApi>(
     client: Arc<Client<RuntimeApi>>,
     transaction_pool: Arc<TransactionPool<RuntimeApi>>,
     keystore_container: &KeystoreContainer,
     select_chain: LongestChain<TFullBackend<Block>, Block>,
     task_manager: &TaskManager,
-) -> Result<(), Error>
+) -> Result<impl Future<Output = ()> + Send + 'static, Error>
 where
     RuntimeApi: ConstructRuntimeApi<Block, Client<RuntimeApi>> + Send + Sync + 'static,
     RuntimeApi::RuntimeApi: RuntimeApiCommon<StateBackend = StateBackend> + RuntimeApiNimbus,
@@ -225,11 +226,5 @@ where
         },
     });
 
-    task_manager.spawn_essential_handle().spawn_blocking(
-        "authorship_task",
-        Some("block-authoring"),
-        consensus,
-    );
-
-    Ok(())
+    Ok(consensus)
 }

node/src/command.rs

@@ -427,7 +427,7 @@ pub fn run_with(cli: Cli) -> Result {
 
             runner.run_node_until_exit(|config| async move {
                 if is_dev {
-                    info!("DEV STANDALONE MODE.");
+                    info!("⚠️  DEV STANDALONE MODE.");
                     if config.chain_spec.is_dolphin() {
                         return crate::service::start_dev_nimbus_node::<dolphin_runtime::RuntimeApi, _>(
                             config,

node/src/service.rs

@@ -424,13 +424,19 @@ where
     let select_chain = LongestChain::new(backend.clone());
 
     if role.is_authority() {
-        crate::builder::start_dev_nimbus_instant_seal_consensus(
+        let dev_consensus = crate::builder::build_dev_nimbus_consensus(
             client.clone(),
             transaction_pool.clone(),
             &keystore_container,
             select_chain,
             &task_manager,
         )?;
+
+        task_manager.spawn_essential_handle().spawn_blocking(
+            "authorship_task",
+            Some("block-authoring"),
+            dev_consensus,
+        );
     }
 
     let rpc_builder = {