From a8304136faaa58c4fd41e2caa71d5a3f4fb26285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Chabowski?= Date: Fri, 17 Jan 2025 12:59:30 +0100 Subject: [PATCH 1/4] Check that fuel-core lib builds correctly without default features --- ci_checks.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci_checks.sh b/ci_checks.sh index 9c2e95bd297..e20252550eb 100755 --- 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 && From a0e63894fd1741961925a17b6a23a6ce988ab8aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Chabowski?= Date: Fri, 17 Jan 2025 13:06:55 +0100 Subject: [PATCH 2/4] Update GitHub CI workflow --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ca3d379b5a..ba60c9c3777 100644 --- 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 From 433e4d4139dca595bd73359b2465e554ee16263a Mon Sep 17 00:00:00 2001 From: Aaryamann Challani <43716372+rymnc@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:12:18 +0530 Subject: [PATCH 3/4] fix: cond compilation w rocksdb --- crates/fuel-core/src/combined_database.rs | 1 + crates/fuel-core/src/database.rs | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/fuel-core/src/combined_database.rs b/crates/fuel-core/src/combined_database.rs index 64ce3459e83..1a9a328f0a4 100644 --- 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 index 37b5f2b097e..122feda2ff5 100644 --- a/crates/fuel-core/src/database.rs +++ b/crates/fuel-core/src/database.rs @@ -67,6 +67,12 @@ pub use fuel_core_database::Error; pub type Result = core::result::Result; // 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::rocks_db::ColumnsPolicy; #[cfg(feature = "rocksdb")] use crate::state::{ historical_rocksdb::{ @@ -79,13 +85,6 @@ use crate::state::{ RocksDb, }, }; -use crate::{ - database::database_description::{ - gas_price::GasPriceDatabase, - indexation_availability, - }, - state::rocks_db::ColumnsPolicy, -}; #[cfg(feature = "rocksdb")] use std::path::Path; From 2a95010bbc1419add993dcbff72db9d71df98140 Mon Sep 17 00:00:00 2001 From: Aaryamann Challani <43716372+rymnc@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:48:28 +0530 Subject: [PATCH 4/4] fix: import --- crates/fuel-core/src/database.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/fuel-core/src/database.rs b/crates/fuel-core/src/database.rs index 122feda2ff5..1f3abfb59a9 100644 --- a/crates/fuel-core/src/database.rs +++ b/crates/fuel-core/src/database.rs @@ -72,8 +72,6 @@ use crate::database::database_description::{ indexation_availability, }; #[cfg(feature = "rocksdb")] -use crate::state::rocks_db::ColumnsPolicy; -#[cfg(feature = "rocksdb")] use crate::state::{ historical_rocksdb::{ description::Historical, @@ -81,6 +79,7 @@ use crate::state::{ StateRewindPolicy, }, rocks_db::{ + ColumnsPolicy, DatabaseConfig, RocksDb, },