Merge branch 'rafal/2576_extend_node_info' of github.com:FuelLabs/fue…

…l-core into rafal/2576_extend_node_info
FuelLabs · Jan 22, 2025 · 1ce3ba4 · 1ce3ba4
2 parents b3ecacf + 6c1e35c
commit 1ce3ba4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -152,6 +152,8 @@ jobs:
             args: -p fuel-core-chain-config --target wasm32-unknown-unknown --no-default-features
           - command: check
             args: -p fuel-core-executor --target wasm32-unknown-unknown --no-default-features --features alloc
+          - command: check
+            args: -p fuel-core --no-default-features
       fail-fast: false
 
     # disallow any job that takes longer than 45 minutes

diff --git a/ci_checks.sh b/ci_checks.sh
@@ -27,6 +27,7 @@ cargo check -p fuel-core-storage --target wasm32-unknown-unknown --no-default-fe
 cargo check -p fuel-core-client --target wasm32-unknown-unknown --no-default-features &&
 cargo check -p fuel-core-chain-config --target wasm32-unknown-unknown --no-default-features &&
 cargo check -p fuel-core-executor --target wasm32-unknown-unknown --no-default-features --features alloc &&
+cargo check -p fuel-core --no-default-features &&
 cargo make check --all-features --locked &&
 cargo make check --locked &&
 OVERRIDE_CHAIN_CONFIGS=true cargo test --test integration_tests local_node &&

diff --git a/crates/fuel-core/src/combined_database.rs b/crates/fuel-core/src/combined_database.rs
@@ -44,6 +44,7 @@ pub struct CombinedDatabaseConfig {
     pub database_type: DbType,
     #[cfg(feature = "rocksdb")]
     pub database_config: DatabaseConfig,
+    #[cfg(feature = "rocksdb")]
     pub state_rewind_policy: StateRewindPolicy,
 }
 

diff --git a/crates/fuel-core/src/database.rs b/crates/fuel-core/src/database.rs
@@ -67,6 +67,10 @@ pub use fuel_core_database::Error;
 pub type Result<T> = core::result::Result<T, Error>;
 
 // TODO: Extract `Database` and all belongs into `fuel-core-database`.
+use crate::database::database_description::{
+    gas_price::GasPriceDatabase,
+    indexation_availability,
+};
 #[cfg(feature = "rocksdb")]
 use crate::state::{
     historical_rocksdb::{
@@ -75,17 +79,11 @@ use crate::state::{
         StateRewindPolicy,
     },
     rocks_db::{
+        ColumnsPolicy,
         DatabaseConfig,
         RocksDb,
     },
 };
-use crate::{
-    database::database_description::{
-        gas_price::GasPriceDatabase,
-        indexation_availability,
-    },
-    state::rocks_db::ColumnsPolicy,
-};
 #[cfg(feature = "rocksdb")]
 use std::path::Path;