From a2904c130c1a7e93369afb4fdcba90c862b89081 Mon Sep 17 00:00:00 2001 From: Pravdyvy Date: Thu, 2 Apr 2026 17:45:49 +0300 Subject: [PATCH] fix: suggestion fix 3 --- storage/src/{storable_cell => cells}/mod.rs | 2 +- storage/src/{storable_cell => }/cells/shared_cells.rs | 2 +- storage/src/indexer/indexer_cells.rs | 4 ++-- storage/src/indexer/read_once.rs | 4 +--- storage/src/indexer/write_atomic.rs | 2 +- storage/src/indexer/write_non_atomic.rs | 2 +- storage/src/lib.rs | 4 ++-- storage/src/sequencer/mod.rs | 4 +--- storage/src/sequencer/sequencer_cells.rs | 4 ++-- storage/src/storable_cell/cells/mod.rs | 1 - 10 files changed, 12 insertions(+), 17 deletions(-) rename storage/src/{storable_cell => cells}/mod.rs (99%) rename storage/src/{storable_cell => }/cells/shared_cells.rs (96%) delete mode 100644 storage/src/storable_cell/cells/mod.rs diff --git a/storage/src/storable_cell/mod.rs b/storage/src/cells/mod.rs similarity index 99% rename from storage/src/storable_cell/mod.rs rename to storage/src/cells/mod.rs index 5a00e3a6..76c1ff8c 100644 --- a/storage/src/storable_cell/mod.rs +++ b/storage/src/cells/mod.rs @@ -5,7 +5,7 @@ use rocksdb::{BoundColumnFamily, DBWithThreadMode, MultiThreaded, WriteBatch}; use crate::{DbResult, error::DbError}; -pub mod cells; +pub mod shared_cells; pub trait SimpleStorableCell { const CF_NAME: &'static str; diff --git a/storage/src/storable_cell/cells/shared_cells.rs b/storage/src/cells/shared_cells.rs similarity index 96% rename from storage/src/storable_cell/cells/shared_cells.rs rename to storage/src/cells/shared_cells.rs index 6dc434c2..2a76edf3 100644 --- a/storage/src/storable_cell/cells/shared_cells.rs +++ b/storage/src/cells/shared_cells.rs @@ -4,8 +4,8 @@ use common::block::Block; use crate::{ BLOCK_CELL_NAME, CF_BLOCK_NAME, CF_META_NAME, DB_META_FIRST_BLOCK_IN_DB_KEY, DB_META_FIRST_BLOCK_SET_KEY, DB_META_LAST_BLOCK_IN_DB_KEY, DbResult, + cells::{SimpleReadableCell, SimpleStorableCell, SimpleWritableCell}, error::DbError, - storable_cell::{SimpleReadableCell, SimpleStorableCell, SimpleWritableCell}, }; #[derive(Debug, BorshSerialize, BorshDeserialize)] diff --git a/storage/src/indexer/indexer_cells.rs b/storage/src/indexer/indexer_cells.rs index 57766252..76a2c035 100644 --- a/storage/src/indexer/indexer_cells.rs +++ b/storage/src/indexer/indexer_cells.rs @@ -3,13 +3,13 @@ use nssa::V03State; use crate::{ CF_META_NAME, DbResult, + cells::{SimpleReadableCell, SimpleStorableCell, SimpleWritableCell}, error::DbError, indexer::{ ACC_NUM_CELL_NAME, BLOCK_HASH_CELL_NAME, BREAKPOINT_CELL_NAME, CF_ACC_META, CF_BREAKPOINT_NAME, CF_HASH_TO_ID, CF_TX_TO_ID, DB_META_LAST_BREAKPOINT_ID, DB_META_LAST_OBSERVED_L1_LIB_HEADER_ID_IN_DB_KEY, TX_HASH_CELL_NAME, }, - storable_cell::{SimpleReadableCell, SimpleStorableCell, SimpleWritableCell}, }; #[derive(Debug, BorshSerialize, BorshDeserialize)] @@ -214,8 +214,8 @@ impl SimpleWritableCell for AccNumTxCell { #[cfg(test)] mod uniform_tests { use crate::{ + cells::SimpleStorableCell as _, indexer::indexer_cells::{BreakpointCellOwned, BreakpointCellRef}, - storable_cell::SimpleStorableCell as _, }; #[test] diff --git a/storage/src/indexer/read_once.rs b/storage/src/indexer/read_once.rs index bf084c84..b1ae0ada 100644 --- a/storage/src/indexer/read_once.rs +++ b/storage/src/indexer/read_once.rs @@ -1,13 +1,11 @@ use super::{Block, DbResult, RocksDBIO, V03State}; use crate::{ DBIO as _, + cells::shared_cells::{BlockCell, FirstBlockCell, FirstBlockSetCell, LastBlockCell}, indexer::indexer_cells::{ AccNumTxCell, BlockHashToBlockIdMapCell, BreakpointCellOwned, LastBreakpointIdCell, LastObservedL1LibHeaderCell, TxHashToBlockIdMapCell, }, - storable_cell::cells::shared_cells::{ - BlockCell, FirstBlockCell, FirstBlockSetCell, LastBlockCell, - }, }; #[expect(clippy::multiple_inherent_impl, reason = "Readability")] diff --git a/storage/src/indexer/write_atomic.rs b/storage/src/indexer/write_atomic.rs index b8ea4751..9b661f3b 100644 --- a/storage/src/indexer/write_atomic.rs +++ b/storage/src/indexer/write_atomic.rs @@ -5,11 +5,11 @@ use rocksdb::WriteBatch; use super::{BREAKPOINT_INTERVAL, Block, DbError, DbResult, RocksDBIO}; use crate::{ DB_META_FIRST_BLOCK_IN_DB_KEY, DBIO as _, + cells::shared_cells::{FirstBlockSetCell, LastBlockCell}, indexer::indexer_cells::{ AccNumTxCell, BlockHashToBlockIdMapCell, LastBreakpointIdCell, LastObservedL1LibHeaderCell, TxHashToBlockIdMapCell, }, - storable_cell::cells::shared_cells::{FirstBlockSetCell, LastBlockCell}, }; #[expect(clippy::multiple_inherent_impl, reason = "Readability")] diff --git a/storage/src/indexer/write_non_atomic.rs b/storage/src/indexer/write_non_atomic.rs index a250dcc7..62b466a2 100644 --- a/storage/src/indexer/write_non_atomic.rs +++ b/storage/src/indexer/write_non_atomic.rs @@ -1,10 +1,10 @@ use super::{BREAKPOINT_INTERVAL, DbError, DbResult, RocksDBIO, V03State}; use crate::{ DBIO as _, + cells::shared_cells::{FirstBlockSetCell, LastBlockCell}, indexer::indexer_cells::{ BreakpointCellRef, LastBreakpointIdCell, LastObservedL1LibHeaderCell, }, - storable_cell::cells::shared_cells::{FirstBlockSetCell, LastBlockCell}, }; #[expect(clippy::multiple_inherent_impl, reason = "Readability")] diff --git a/storage/src/lib.rs b/storage/src/lib.rs index 182b8991..2edb0ee3 100644 --- a/storage/src/lib.rs +++ b/storage/src/lib.rs @@ -1,14 +1,14 @@ use rocksdb::{DBWithThreadMode, MultiThreaded, WriteBatch}; use crate::{ + cells::{SimpleReadableCell, SimpleWritableCell}, error::DbError, - storable_cell::{SimpleReadableCell, SimpleWritableCell}, }; +pub mod cells; pub mod error; pub mod indexer; pub mod sequencer; -pub mod storable_cell; /// Maximal size of stored blocks in base. /// diff --git a/storage/src/sequencer/mod.rs b/storage/src/sequencer/mod.rs index 140008b5..508f6c29 100644 --- a/storage/src/sequencer/mod.rs +++ b/storage/src/sequencer/mod.rs @@ -8,14 +8,12 @@ use rocksdb::{ use crate::{ CF_BLOCK_NAME, CF_META_NAME, DB_META_FIRST_BLOCK_IN_DB_KEY, DBIO, DbResult, + cells::shared_cells::{BlockCell, FirstBlockCell, FirstBlockSetCell, LastBlockCell}, error::DbError, sequencer::sequencer_cells::{ LastFinalizedBlockIdCell, LatestBlockMetaCellOwned, LatestBlockMetaCellRef, NSSAStateCellOwned, NSSAStateCellRef, }, - storable_cell::cells::shared_cells::{ - BlockCell, FirstBlockCell, FirstBlockSetCell, LastBlockCell, - }, }; pub mod sequencer_cells; diff --git a/storage/src/sequencer/sequencer_cells.rs b/storage/src/sequencer/sequencer_cells.rs index 386cd953..0ad092d7 100644 --- a/storage/src/sequencer/sequencer_cells.rs +++ b/storage/src/sequencer/sequencer_cells.rs @@ -4,12 +4,12 @@ use nssa::V03State; use crate::{ CF_META_NAME, DbResult, + cells::{SimpleReadableCell, SimpleStorableCell, SimpleWritableCell}, error::DbError, sequencer::{ CF_NSSA_STATE_NAME, DB_META_LAST_FINALIZED_BLOCK_ID, DB_META_LATEST_BLOCK_META_KEY, DB_NSSA_STATE_KEY, }, - storable_cell::{SimpleReadableCell, SimpleStorableCell, SimpleWritableCell}, }; #[derive(BorshDeserialize)] @@ -98,10 +98,10 @@ impl SimpleWritableCell for LatestBlockMetaCellRef<'_> { #[cfg(test)] mod uniform_tests { use crate::{ + cells::SimpleStorableCell as _, sequencer::sequencer_cells::{ LatestBlockMetaCellOwned, LatestBlockMetaCellRef, NSSAStateCellOwned, NSSAStateCellRef, }, - storable_cell::SimpleStorableCell as _, }; #[test] diff --git a/storage/src/storable_cell/cells/mod.rs b/storage/src/storable_cell/cells/mod.rs deleted file mode 100644 index a464144b..00000000 --- a/storage/src/storable_cell/cells/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod shared_cells;