diff --git a/bin/fuel-core/Cargo.toml b/bin/fuel-core/Cargo.toml index 35790b86d60..4fa536d3206 100644 --- a/bin/fuel-core/Cargo.toml +++ b/bin/fuel-core/Cargo.toml @@ -35,9 +35,9 @@ tikv-jemallocator = { workspace = true } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing = { workspace = true } tracing-subscriber = { workspace = true, features = [ - "ansi", - "env-filter", - "json", + "ansi", + "env-filter", + "json", ] } url = { version = "2.2", optional = true } @@ -55,9 +55,9 @@ relayer = ["fuel-core/relayer", "dep:url"] parquet = ["fuel-core-chain-config/parquet"] rocksdb = ["fuel-core/rocksdb", "dep:fuel-core-storage", "dep:itertools"] rocksdb-production = [ - "fuel-core/rocksdb-production", - "dep:fuel-core-storage", - "dep:itertools", + "fuel-core/rocksdb-production", + "dep:fuel-core-storage", + "dep:itertools", ] # features to enable in production, but increase build times production = ["env", "relayer", "rocksdb-production", "p2p", "parquet"] diff --git a/bin/fuel-core/src/cli/snapshot.rs b/bin/fuel-core/src/cli/snapshot.rs index d6d770658ff..025cb463e8a 100644 --- a/bin/fuel-core/src/cli/snapshot.rs +++ b/bin/fuel-core/src/cli/snapshot.rs @@ -371,10 +371,7 @@ mod tests { let height = 10u32.into(); block.header_mut().application_mut().da_height = 14u64.into(); block.header_mut().set_block_height(height); - self.db - .storage::() - .insert(&height, &block) - .unwrap(); + let _ = self.db.storage::().insert(&height, &block); block } diff --git a/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_coins_are_human_readable.snap b/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_coins_are_human_readable.snap index da4a1604895..124d9959e39 100644 --- a/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_coins_are_human_readable.snap +++ b/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_coins_are_human_readable.snap @@ -18,5 +18,6 @@ expression: encoded_json "contracts": [], "contract_state": [], "contract_balance": [], - "block_height": 0 + "block_height": 0, + "da_block_height": 0 } diff --git a/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_contracts_are_human_readable.snap b/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_contracts_are_human_readable.snap index 546636e8f8d..f1fff110754 100644 --- a/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_contracts_are_human_readable.snap +++ b/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_contracts_are_human_readable.snap @@ -18,5 +18,6 @@ expression: encoded_json ], "contract_state": [], "contract_balance": [], - "block_height": 0 + "block_height": 0, + "da_block_height": 0 } diff --git a/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_messages_are_human_readable.snap b/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_messages_are_human_readable.snap index 3a101b02a4e..5134d3e6282 100644 --- a/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_messages_are_human_readable.snap +++ b/crates/chain-config/src/config/state/snapshots/fuel_core_chain_config__config__state__writer__tests__json_messages_are_human_readable.snap @@ -17,5 +17,6 @@ expression: encoded_json "contracts": [], "contract_state": [], "contract_balance": [], - "block_height": 0 + "block_height": 0, + "da_block_height": 0 } diff --git a/crates/fuel-core/src/database.rs b/crates/fuel-core/src/database.rs index f913ec5cc69..94ebe7a8e6b 100644 --- a/crates/fuel-core/src/database.rs +++ b/crates/fuel-core/src/database.rs @@ -482,9 +482,8 @@ impl ChainStateDb for Database { } fn get_last_block(&self) -> StorageResult { - Ok(self - .latest_compressed_block()? - .ok_or(not_found!(FuelBlocks))?) + self.latest_compressed_block()? + .ok_or(not_found!(FuelBlocks)) } } diff --git a/tests/tests/balances.rs b/tests/tests/balances.rs index 4edd0a59461..b82d71a7561 100644 --- a/tests/tests/balances.rs +++ b/tests/tests/balances.rs @@ -65,7 +65,7 @@ async fn balance() { nonce: (nonce as u64).into(), amount, data: vec![], - da_height: DaBlockHeight::from(1usize), + da_height: DaBlockHeight::from(0usize), }) .collect(), ..Default::default() @@ -184,7 +184,7 @@ async fn first_5_balances() { nonce: (nonce as u64).into(), amount, data: vec![], - da_height: DaBlockHeight::from(1usize), + da_height: DaBlockHeight::from(0usize), }; nonce += 1; message diff --git a/tests/tests/coins.rs b/tests/tests/coins.rs index 589b4ddf0f9..6ac95b9880c 100644 --- a/tests/tests/coins.rs +++ b/tests/tests/coins.rs @@ -309,7 +309,7 @@ mod message_coin { nonce: (nonce as u64).into(), amount, data: vec![], - da_height: DaBlockHeight::from(1u64), + da_height: DaBlockHeight::from(0u64), }) .collect(), ..Default::default() @@ -529,7 +529,7 @@ mod all_coins { nonce: (nonce as u64).into(), amount, data: vec![], - da_height: DaBlockHeight::from(1u64), + da_height: DaBlockHeight::from(0u64), }) .collect(), ..Default::default() diff --git a/tests/tests/snapshot.rs b/tests/tests/snapshot.rs index ddb3dcbc44c..186970a003c 100644 --- a/tests/tests/snapshot.rs +++ b/tests/tests/snapshot.rs @@ -92,7 +92,7 @@ async fn loads_snapshot() { nonce: Nonce::from(rng.gen_range(0..1000)), amount: rng.gen_range(0..1000), data: vec![], - da_height: DaBlockHeight(rng.gen_range(0..1000)), + da_height: DaBlockHeight(19), }], block_height: BlockHeight::from(10), da_block_height: 20u64.into(),