chore(storage): apply clippy suggestions

block-util/src/archive_package.rs

@@ -150,7 +150,7 @@ impl ArchivePackageVerifier {
                             part.as_ptr().add(offset),
                             buffer.as_mut_ptr().add(*filled),
                             remaining,
-                        )
+                        );
                     };
 
                     offset += remaining;
@@ -226,4 +226,4 @@ pub enum ArchivePackageError {
 
 pub const ARCHIVE_PREFIX: [u8; 4] = u32::to_le_bytes(0xae8fdd01);
 const ARCHIVE_ENTRY_PREFIX: [u8; 2] = u16::to_le_bytes(0x1e8b);
-const ARCHIVE_ENTRY_HEADER_LEN: usize = ARCHIVE_ENTRY_PREFIX.len() + 2 + 4; // magic + filename len + data len
+const ARCHIVE_ENTRY_HEADER_LEN: usize = ARCHIVE_ENTRY_PREFIX.len() + 2 + 4; // magic + filename len + data len

block-util/src/block.rs

@@ -1,7 +1,7 @@
-/// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
-///
-/// Changes:
-/// - replaced old `failure` crate with `anyhow`
+// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
+//
+// Changes:
+// - replaced old `failure` crate with `anyhow`
 use anyhow::{anyhow, Context, Result};
 use everscale_types::models::*;
 use everscale_types::prelude::*;

block-util/src/block_proof.rs

@@ -1,7 +1,7 @@
-/// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
-///
-/// Changes:
-/// - replaced old `failure` crate with `anyhow`
+// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
+//
+// Changes:
+// - replaced old `failure` crate with `anyhow`
 use anyhow::{anyhow, Context, Result};
 use everscale_types::merkle::*;
 use everscale_types::models::*;

block-util/src/mapped_file.rs

@@ -78,7 +78,7 @@ impl MappedFile {
     pub unsafe fn write_all_at(&self, offset: usize, buffer: &[u8]) {
         std::ptr::copy_nonoverlapping(
             buffer.as_ptr(),
-            (self.ptr as *mut u8).add(offset),
+            self.ptr.cast::<u8>().add(offset),
             buffer.len(),
         )
     }

block-util/src/package_entry_id.rs

@@ -40,8 +40,8 @@ impl PackageEntryId<BlockId> {
 }
 
 impl<I> PackageEntryId<I>
-    where
-        I: Borrow<BlockId>,
+where
+    I: Borrow<BlockId>,
 {
     /// Returns package entry prefix
     fn filename_prefix(&self) -> &'static str {
@@ -91,8 +91,8 @@ impl GetFileName for BlockId {
 }
 
 impl<I> GetFileName for PackageEntryId<I>
-    where
-        I: Borrow<BlockId> + Hash,
+where
+    I: Borrow<BlockId> + Hash,
 {
     fn filename(&self) -> String {
         match self {
@@ -188,7 +188,7 @@ enum PackageEntryIdError {
 
 #[cfg(test)]
 mod tests {
-    use rand::{random};
+    use rand::random;
 
     use super::*;
 
@@ -212,4 +212,4 @@ mod tests {
         check_package_id(PackageEntryId::Proof(block_id.clone()));
         check_package_id(PackageEntryId::ProofLink(block_id));
     }
-}
+}

block-util/src/shard_state.rs

@@ -58,7 +58,7 @@ impl ShardStateStuff {
             left: Lazy::from_raw(left),
             right: Lazy::from_raw(right),
         })
-            .map_err(From::from)
+        .map_err(From::from)
     }
 
     pub fn deserialize_zerostate(id: BlockId, bytes: &[u8]) -> Result<Self> {

block-util/src/stored_value.rs

@@ -23,16 +23,16 @@ pub trait StoredValue {
     ///
     /// NOTE: `reader` should not be used after this call in case of an error
     fn deserialize(reader: &mut &[u8]) -> Result<Self>
-        where
-            Self: Sized;
+    where
+        Self: Sized;
 
     /// Deserializes the data from the buffer.
     ///
     /// [`StoredValue::deserialize`]
     #[inline(always)]
     fn from_slice(mut data: &[u8]) -> Result<Self>
-        where
-            Self: Sized,
+    where
+        Self: Sized,
     {
         Self::deserialize(&mut data)
     }
@@ -64,8 +64,8 @@ impl StoredValueBuffer for Vec<u8> {
 }
 
 impl<T> StoredValueBuffer for SmallVec<T>
-    where
-        T: smallvec::Array<Item = u8>,
+where
+    T: smallvec::Array<Item = u8>,
 {
     #[inline(always)]
     fn write_byte(&mut self, byte: u8) {
@@ -96,8 +96,8 @@ impl StoredValue for BlockId {
     }
 
     fn deserialize(reader: &mut &[u8]) -> Result<Self>
-        where
-            Self: Sized,
+    where
+        Self: Sized,
     {
         let shard = ShardIdent::deserialize(reader)?;
         let seqno = reader.get_u32();
@@ -131,8 +131,8 @@ impl StoredValue for ShardIdent {
     }
 
     fn deserialize(reader: &mut &[u8]) -> Result<Self>
-        where
-            Self: Sized,
+    where
+        Self: Sized,
     {
         let workchain = reader.get_u32() as i32;
         let prefix = reader.get_u64();
@@ -154,16 +154,16 @@ impl StoredValue for BlockIdShort {
     }
 
     fn deserialize(reader: &mut &[u8]) -> Result<Self>
-        where
-            Self: Sized,
+    where
+        Self: Sized,
     {
         let shard = ShardIdent::deserialize(reader)?;
         let seqno = reader.get_u32();
         Ok(Self { shard, seqno })
     }
 }
 
-/// Writes BlockIdExt in little-endian format
+/// Writes `BlockIdExt` in little-endian format
 pub fn write_block_id_le(block_id: &BlockId) -> [u8; 80] {
     let mut bytes = [0u8; 80];
     bytes[..4].copy_from_slice(&block_id.shard.workchain().to_le_bytes());
@@ -174,7 +174,7 @@ pub fn write_block_id_le(block_id: &BlockId) -> [u8; 80] {
     bytes
 }
 
-/// Reads BlockIdExt in little-endian format
+/// Reads `BlockIdExt` in little-endian format
 pub fn read_block_id_le(data: &[u8]) -> Option<BlockId> {
     if data.len() < 80 {
         return None;
@@ -238,4 +238,4 @@ mod tests {
 
         assert_eq!(read_block_id_le(&serialized).unwrap(), block_id);
     }
-}
+}

block-util/src/top_blocks.rs

@@ -115,8 +115,8 @@ impl StoredValue for TopBlocks {
     }
 
     fn deserialize(reader: &mut &[u8]) -> Result<Self>
-        where
-            Self: Sized,
+    where
+        Self: Sized,
     {
         let mc_block = BlockIdShort::deserialize(reader)?;
 

block-util/src/with_archive_data.rs

@@ -16,8 +16,8 @@ pub struct WithArchiveData<T> {
 impl<T> WithArchiveData<T> {
     /// Constructs a new object from the context with known raw data
     pub fn new<A>(data: T, archive_data: A) -> Self
-        where
-            Bytes: From<A>,
+    where
+        Bytes: From<A>,
     {
         Self {
             data,
@@ -79,4 +79,4 @@ mod tests {
         );
         assert!(WithArchiveData::loaded(()).new_archive_data().is_err());
     }
-}
+}

storage/src/block_handle_storage/mod.rs

@@ -1,8 +1,8 @@
-/// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
-///
-/// Changes:
-/// - replaced old `failure` crate with `anyhow`
-/// - simplified storing
+// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
+//
+// Changes:
+// - replaced old `failure` crate with `anyhow`
+// - simplified storing
 use std::sync::{Arc, Weak};
 
 use anyhow::Result;

storage/src/block_storage/mod.rs

@@ -53,7 +53,7 @@ impl BlockStorage {
             );
 
             if let Some(Err(e)) = value.map(check_archive) {
-                tracing::error!(archive_id, "failed to read archive: {e:?}")
+                tracing::error!(archive_id, "failed to read archive: {e:?}");
             }
 
             archive_ids.insert(archive_id);

storage/src/db/migrations/mod.rs

@@ -47,4 +47,4 @@ impl VersionProvider for NodeStateVersionProvider {
         state.insert(Self::DB_VERSION_KEY, version)?;
         Ok(())
     }
-}
+}

storage/src/db/mod.rs

@@ -173,7 +173,7 @@ impl Db {
             let cf = db.instantiate_table::<T>();
             let res: (usize, usize) = cf
                 .iterator(rocksdb::IteratorMode::Start)
-                .flat_map(|x| {
+                .filter_map(|x| {
                     let x = match x {
                         Ok(x) => x,
                         Err(e) => {
@@ -243,7 +243,7 @@ pub struct DiskUsageInfo {
 
 impl Drop for Db {
     fn drop(&mut self) {
-        self.raw().cancel_all_background_work(true)
+        self.raw().cancel_all_background_work(true);
     }
 }
 

storage/src/db/tables.rs

@@ -89,7 +89,7 @@ impl ColumnFamily for PackageEntries {
     }
 }
 
-/// Maps BlockId to root cell hash
+/// Maps `BlockId` to root cell hash
 /// - Key: `BlockId`
 /// - Value: `[u8; 32]`
 pub struct ShardStates;

storage/src/models/block_handle.rs

@@ -1,8 +1,8 @@
-/// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
-///
-/// Changes:
-/// - replaced old `failure` crate with `anyhow`
-/// - moved all flags to meta
+// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
+//
+// Changes:
+// - replaced old `failure` crate with `anyhow`
+// - moved all flags to meta
 use std::sync::{Arc, Weak};
 
 use anyhow::Result;

storage/src/models/block_meta.rs

@@ -1,9 +1,9 @@
-/// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
-///
-/// Changes:
-/// - replaced old `failure` crate with `anyhow`
-/// - moved all flags here from block handle
-/// - removed temporary unused flags
+// This file is a modified copy of the file from https://github.com/tonlabs/ton-labs-node
+//
+// Changes:
+// - replaced old `failure` crate with `anyhow`
+// - moved all flags here from block handle
+// - removed temporary unused flags
 use std::sync::atomic::{AtomicU64, Ordering};
 
 use anyhow::Result;
@@ -209,7 +209,7 @@ impl BlockMeta {
 
 impl StoredValue for BlockMeta {
     /// 8 bytes flags
-    /// 4 bytes gen_utime
+    /// 4 bytes `gen_utime`
     const SIZE_HINT: usize = 8 + 4;
 
     type OnStackSlice = [u8; Self::SIZE_HINT];

storage/src/runtime_storage/mod.rs

@@ -20,4 +20,4 @@ impl RuntimeStorage {
     pub fn persistent_state_keeper(&self) -> &PersistentStateKeeper {
         &self.persistent_state_keeper
     }
-}
+}

storage/src/runtime_storage/persistent_state_keeper.rs

@@ -82,7 +82,7 @@ impl PersistentStateKeeper {
             .map(|handle| (handle.id().seqno, handle.meta().brief()))
     }
 
-    pub fn new_state_found(&self) -> tokio::sync::futures::Notified {
+    pub fn new_state_found(&self) -> tokio::sync::futures::Notified<'_> {
         self.persistent_state_changed.notified()
     }
 }

storage/src/shard_state_storage/cell_storage.rs

@@ -243,7 +243,7 @@ impl CellStorage {
         let cells = &self.db.cells;
         let cells_cf = &cells.cf();
 
-        let mut transaction: FastHashMap<&HashBytes, CellState> =
+        let mut transaction: FastHashMap<&HashBytes, CellState<'_>> =
             FastHashMap::with_capacity_and_hasher(128, Default::default());
         let mut buffer = Vec::with_capacity(4);
 
@@ -394,7 +394,7 @@ impl StorageCell {
         };
 
         for slot in reference_data.iter().take(ref_count) {
-            let slot = slot.get() as *mut u8;
+            let slot = slot.get().cast::<u8>();
             unsafe { std::ptr::copy_nonoverlapping(buffer.as_ptr().add(offset), slot, 32) };
             offset += 32;
         }

storage/src/shard_state_storage/cell_writer.rs

@@ -240,7 +240,7 @@ fn write_rev_cells<P: AsRef<Path>>(
 
                     for i in 0..preload_count {
                         let index = indices_buffer[i];
-                        let hash = unsafe { *(keys[i] as *const [u8; 32]) };
+                        let hash = unsafe { *keys[i].cast::<[u8; 32]>() };
                         stack.push((index, StackItem::New(hash)));
                     }
                 }