Comment initialization of the parallel-executor to not have errors wi…

…th --all-features
FuelLabs · Jan 22, 2025 · 41a41fe · 41a41fe
1 parent 60a0912
commit 41a41fe
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/crates/fuel-core/src/service/adapters.rs b/crates/fuel-core/src/service/adapters.rs
@@ -19,8 +19,8 @@ use fuel_core_consensus_module::{
 use fuel_core_executor::executor::OnceTransactionsSource;
 use fuel_core_gas_price_service::v1::service::LatestGasPrice;
 use fuel_core_importer::ImporterResult;
-#[cfg(feature = "parallel-executor")]
-use fuel_core_parallel_executor::executor::Executor;
+// #[cfg(feature = "parallel-executor")]
+// use fuel_core_parallel_executor::executor::Executor;
 use fuel_core_poa::ports::BlockSigner;
 use fuel_core_services::stream::BoxStream;
 use fuel_core_storage::transactional::Changes;
@@ -48,7 +48,7 @@ use fuel_core_types::{
     signer::SignMode,
     tai64::Tai64,
 };
-#[cfg(not(feature = "parallel-executor"))]
+//#[cfg(not(feature = "parallel-executor"))]
 use fuel_core_upgradable_executor::executor::Executor;
 use std::sync::Arc;
 
@@ -288,9 +288,9 @@ impl ExecutorAdapter {
     pub fn new(
         database: Database,
         relayer_database: Database<Relayer>,
-        #[cfg(feature = "parallel-executor")]
-        config: fuel_core_parallel_executor::config::Config,
-        #[cfg(not(feature = "parallel-executor"))]
+        // #[cfg(feature = "parallel-executor")]
+        // config: fuel_core_parallel_executor::config::Config,
+        // #[cfg(not(feature = "parallel-executor"))]
         config: fuel_core_upgradable_executor::config::Config,
     ) -> Self {
         let executor = Executor::new(database, relayer_database, config);

diff --git a/crates/fuel-core/src/service/sub_services.rs b/crates/fuel-core/src/service/sub_services.rs
@@ -110,14 +110,13 @@ pub fn init_sub_services(
     let executor = ExecutorAdapter::new(
         database.on_chain().clone(),
         database.relayer().clone(),
-        #[cfg(not(feature = "parallel-executor"))]
+        // #[cfg(not(feature = "parallel-executor"))]
         upgradable_executor_config,
-        #[cfg(feature = "parallel-executor")]
-        fuel_core_parallel_executor::config::Config {
-            // TODO: Change
-            number_of_cores: config.executor_number_of_cores,
-            executor_config: upgradable_executor_config,
-        },
+        // #[cfg(feature = "parallel-executor")]
+        // fuel_core_parallel_executor::config::Config {
+        //     number_of_cores: config.executor_number_of_cores,
+        //     executor_config: upgradable_executor_config,
+        // },
     );
     let import_result_provider =
         ImportResultProvider::new(database.on_chain().clone(), executor.clone());