cleanup

moondance-labs · Nov 3, 2023 · 6b71e47 · 6b71e47
1 parent 80326e9
commit 6b71e47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 46 deletions.
diff --git a/client/node-common/src/service.rs b/client/node-common/src/service.rs
@@ -75,25 +75,7 @@ where
 
 pub fn new_partial<Block, RuntimeApi, ParachainNativeExecutor>(
     config: &Configuration,
-) -> Result<
-    // PartialComponents<
-    //     ParachainClient<Block, RuntimeApi, ParachainNativeExecutor>,
-    //     ParachainBackend<Block>,
-    //     SelectChain,
-    //     sc_consensus::DefaultImportQueue<Block>,
-    //     sc_transaction_pool::FullPool<
-    //         Block,
-    //         ParachainClient<Block, RuntimeApi, ParachainNativeExecutor>,
-    //     >,
-    //     (
-    //         ParachainBlockImport<Block, RuntimeApi, ParachainNativeExecutor>,
-    //         Option<Telemetry>,
-    //         Option<TelemetryWorkerHandle>,
-    //     ),
-    // >,
-    NewPartial<Block, RuntimeApi, ParachainNativeExecutor>,
-    sc_service::Error,
->
+) -> Result<NewPartial<Block, RuntimeApi, ParachainNativeExecutor>, sc_service::Error>
 where
     Block: cumulus_primitives_core::BlockT,
     ParachainNativeExecutor: NativeExecutionDispatch + 'static,
@@ -136,8 +118,7 @@ where
         .with_runtime_cache_size(config.runtime_cache_size)
         .build();
 
-    let executor: ParachainExecutor<ParachainNativeExecutor> =
-        ParachainExecutor::new_with_wasm_executor(wasm);
+    let executor = ParachainExecutor::new_with_wasm_executor(wasm);
 
     let (client, backend, keystore_container, task_manager) =
         sc_service::new_full_parts::<Block, RuntimeApi, _>(
@@ -164,31 +145,6 @@ where
         client.clone(),
     );
 
-    // let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
-
-    // let import_queue = nimbus_consensus::import_queue(
-    //     client.clone(),
-    //     block_import.clone(),
-    //     move |_, _| async move {
-    //         let time = sp_timestamp::InherentDataProvider::from_system_time();
-
-    //         Ok((time,))
-    //     },
-    //     &task_manager.spawn_essential_handle(),
-    //     config.prometheus_registry(),
-    //     false,
-    // )?;
-
-    // Ok(PartialComponents {
-    //     backend,
-    //     client,
-    //     import_queue,
-    //     keystore_container,
-    //     task_manager,
-    //     transaction_pool,
-    //     select_chain,
-    //     other: (block_import, telemetry, telemetry_worker_handle),
-    // })
     Ok(NewPartial {
         client,
         backend,

diff --git a/node/src/service.rs b/node/src/service.rs
@@ -151,6 +151,9 @@ pub fn new_partial(
 
     let block_import = ParachainBlockImport::new(client.clone(), backend.clone());
 
+    // The nimbus import queue ONLY checks the signature correctness
+    // Any other checks corresponding to the author-correctness should be done
+    // in the runtime
     let import_queue = nimbus_consensus::import_queue(
         client.clone(),
         block_import.clone(),