make clippy and fmt happy

Officeyutong · Officeyutong · commit 141e9bf3782e · 2026-01-20T17:38:03.000+08:00
diff --git a/light-client-bin/src/rpc/mod.rs b/light-client-bin/src/rpc/mod.rs
@@ -920,7 +920,7 @@ impl<S: StorageHighLevelOperations + Send + Sync + Clone + 'static> BlockFilterR
                     if let Some(filter_script) = filter_script.as_ref() {
                         match filter_script_type {
                             ScriptType::Lock => {
-                                if storage_cloned
+                                storage_cloned
                                     .get(
                                         Key::TxLockScript(
                                             filter_script,
@@ -934,14 +934,10 @@ impl<S: StorageHighLevelOperations + Send + Sync + Clone + 'static> BlockFilterR
                                         )
                                         .into_vec(),
                                     )
-                                    .expect("get TxLockScript should be OK")
-                                    .is_none()
-                                {
-                                    return None;
-                                };
+                                    .expect("get TxLockScript should be OK")?;
                             }
                             ScriptType::Type => {
-                                if storage_cloned
+                                storage_cloned
                                     .get(
                                         Key::TxTypeScript(
                                             filter_script,
@@ -955,11 +951,7 @@ impl<S: StorageHighLevelOperations + Send + Sync + Clone + 'static> BlockFilterR
                                         )
                                         .into_vec(),
                                     )
-                                    .expect("get TxTypeScript should be OK")
-                                    .is_none()
-                                {
-                                    return None;
-                                };
+                                    .expect("get TxTypeScript should be OK")?;
                             }
                         }
                     }
@@ -1224,7 +1216,7 @@ pub fn build_query_options(
     let script: packed::Script = search_key.script.clone().into();
     let args_len = script.args().len();
     if args_len > MAX_PREFIX_SEARCH_SIZE {
-        return Err(Error::invalid_params(&format!(
+        return Err(Error::invalid_params(format!(
             "search_key.script.args len should be less than {}",
             MAX_PREFIX_SEARCH_SIZE
         )));
@@ -1270,7 +1262,7 @@ pub fn build_filter_options(
     let filter_script_prefix = if let Some(script) = filter.script {
         let script: packed::Script = script.into();
         if script.args().len() > MAX_PREFIX_SEARCH_SIZE {
-            return Err(Error::invalid_params(&format!(
+            return Err(Error::invalid_params(format!(
                 "search_key.filter.script.args len should be less than {}",
                 MAX_PREFIX_SEARCH_SIZE
             )));
diff --git a/light-client-bin/src/subcmds.rs b/light-client-bin/src/subcmds.rs
@@ -13,9 +13,13 @@ use log::debug;
 use ckb_light_client_lib::{
     error::{Error, Result},
     protocols::{
-        BAD_MESSAGE_ALLOWED_EACH_HOUR, CHECK_POINT_INTERVAL, FilterProtocol, LightClientProtocol, Peers, PendingTxs, RelayProtocol, SyncProtocol
+        FilterProtocol, LightClientProtocol, Peers, PendingTxs, RelayProtocol, SyncProtocol,
+        BAD_MESSAGE_ALLOWED_EACH_HOUR, CHECK_POINT_INTERVAL,
+    },
+    storage::{
+        db::{StorageBatchRelatedOperations, StorageGeneralOperations},
+        Storage,
     },
-    storage::{Storage, db::{StorageBatchRelatedOperations, StorageGeneralOperations}},
     utils,
 };
 
diff --git a/light-client-bin/src/tests/mod.rs b/light-client-bin/src/tests/mod.rs
@@ -2,8 +2,8 @@ mod service;
 
 use ckb_chain_spec::{consensus::Consensus, ChainSpec};
 use ckb_light_client_lib::{
-    protocols::{CHECK_POINT_INTERVAL, Peers},
-    storage::{Storage, db::StorageBatchRelatedOperations},
+    protocols::{Peers, CHECK_POINT_INTERVAL},
+    storage::{db::StorageBatchRelatedOperations, Storage},
 };
 use ckb_resource::Resource;
 use tempfile::TempDir;
diff --git a/light-client-bin/src/tests/service.rs b/light-client-bin/src/tests/service.rs
@@ -15,15 +15,6 @@ use ckb_types::{
     H256, U256,
 };
 
-use ckb_light_client_lib::{
-    protocols::{FetchInfo, LastState, ProveRequest, ProveState},
-    service::{
-        FetchStatus, Order, ScriptStatus, ScriptType, SearchKey, SearchKeyFilter,
-        SetScriptsCommand, Status, TransactionWithStatus, TxStatus,
-    },
-    storage::{self, HeaderWithExtension, StorageWithChainData, db::{StorageBatchRelatedOperations, StorageGeneralOperations, StorageGetPinnedRelatedOperations}},
-};
-use ckb_light_client_lib::storage::db::StorageHighLevelOperations;
 use crate::{
     rpc::{
         BlockFilterRpc, BlockFilterRpcImpl, ChainRpc, ChainRpcImpl, TransactionRpc,
@@ -33,6 +24,22 @@ use crate::{
     // tests::utils::{create_peers, new_storage, MockChain},
     tests::{create_peers, new_storage, MockChain},
 };
+use ckb_light_client_lib::storage::db::StorageHighLevelOperations;
+use ckb_light_client_lib::{
+    protocols::{FetchInfo, LastState, ProveRequest, ProveState},
+    service::{
+        FetchStatus, Order, ScriptStatus, ScriptType, SearchKey, SearchKeyFilter,
+        SetScriptsCommand, Status, TransactionWithStatus, TxStatus,
+    },
+    storage::{
+        self,
+        db::{
+            StorageBatchRelatedOperations, StorageGeneralOperations,
+            StorageGetPinnedRelatedOperations,
+        },
+        HeaderWithExtension, StorageWithChainData,
+    },
+};
 
 #[test]
 fn rpc() {
diff --git a/light-client-lib/src/protocols/filter/block_filter.rs b/light-client-lib/src/protocols/filter/block_filter.rs
@@ -1,6 +1,8 @@
 use super::{components, BAD_MESSAGE_BAN_TIME};
 use crate::protocols::{Peers, Status, StatusCode};
-use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations};
+use crate::storage::db::{
+    StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations,
+};
 use crate::storage::Storage;
 use crate::types::{Duration, Instant, RwLock};
 use crate::utils::network::prove_or_download_matched_blocks;
diff --git a/light-client-lib/src/protocols/filter/components/block_filters_process.rs b/light-client-lib/src/protocols/filter/components/block_filters_process.rs
@@ -1,6 +1,8 @@
 use crate::protocols::FilterProtocol;
 use crate::protocols::{Status, StatusCode};
-use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations};
+use crate::storage::db::{
+    StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations,
+};
 use crate::utils::network::prove_or_download_matched_blocks;
 use ckb_constant::sync::INIT_BLOCKS_IN_TRANSIT_PER_PEER;
 use ckb_network::{BoxedCKBProtocolContext, PeerIndex};
diff --git a/light-client-lib/src/protocols/light_client/components/send_blocks_proof.rs b/light-client-lib/src/protocols/light_client/components/send_blocks_proof.rs
@@ -8,7 +8,7 @@ use ckb_types::{
 use log::{debug, error, info};
 use rand::seq::SliceRandom;
 
-use crate::storage::{HeaderWithExtension, db::StorageBatchRelatedOperations};
+use crate::storage::{db::StorageBatchRelatedOperations, HeaderWithExtension};
 
 use super::{
     super::{LightClientProtocol, Status, StatusCode},
diff --git a/light-client-lib/src/protocols/light_client/components/send_transactions_proof.rs b/light-client-lib/src/protocols/light_client/components/send_transactions_proof.rs
@@ -6,7 +6,10 @@ use ckb_types::{
 };
 use log::{debug, error};
 
-use crate::{protocols::light_client::components::verify_extra_hash, storage::{HeaderWithExtension, db::StorageBatchRelatedOperations}};
+use crate::{
+    protocols::light_client::components::verify_extra_hash,
+    storage::{db::StorageBatchRelatedOperations, HeaderWithExtension},
+};
 
 use super::{
     super::{LightClientProtocol, Status, StatusCode},
diff --git a/light-client-lib/src/protocols/light_client/mod.rs b/light-client-lib/src/protocols/light_client/mod.rs
@@ -44,7 +44,10 @@ use super::{
     status::{Status, StatusCode},
     BAD_MESSAGE_BAN_TIME,
 };
-use crate::storage::db::{StorageBatchRelatedOperations, StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations};
+use crate::storage::db::{
+    StorageBatchRelatedOperations, StorageGeneralOperations, StorageGetPinnedRelatedOperations,
+    StorageHighLevelOperations,
+};
 
 use crate::protocols::{GET_BLOCKS_PROOF_LIMIT, GET_TRANSACTIONS_PROOF_LIMIT, LAST_N_BLOCKS};
 use crate::storage::Storage;
diff --git a/light-client-lib/src/protocols/relayer.rs b/light-client-lib/src/protocols/relayer.rs
@@ -10,8 +10,8 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
 use crate::protocols::{Peers, BAD_MESSAGE_BAN_TIME};
-use crate::storage::Storage;
 use crate::storage::db::StorageGetPinnedRelatedOperations;
+use crate::storage::Storage;
 use crate::types::{Duration, Instant, RwLock};
 use crate::{read_lock, write_lock};
 
diff --git a/light-client-lib/src/protocols/synchronizer.rs b/light-client-lib/src/protocols/synchronizer.rs
@@ -9,7 +9,9 @@ use std::sync::Arc;
 
 use super::BAD_MESSAGE_BAN_TIME;
 use crate::protocols::Peers;
-use crate::storage::db::{StorageBatchRelatedOperations, StorageGeneralOperations, StorageHighLevelOperations};
+use crate::storage::db::{
+    StorageBatchRelatedOperations, StorageGeneralOperations, StorageHighLevelOperations,
+};
 use crate::storage::Storage;
 use crate::utils::network::prove_or_download_matched_blocks;
 
diff --git a/light-client-lib/src/storage/db/browser.rs b/light-client-lib/src/storage/db/browser.rs
@@ -5,6 +5,8 @@ use super::super::{
 };
 use anyhow::{anyhow, bail, Context};
 
+use crate::storage::db::StorageBatchRelatedOperations;
+use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations};
 use ckb_types::{
     core::{
         cell::{CellMeta, CellStatus},
@@ -18,8 +20,6 @@ use light_client_db_common::{
     idb_cursor_direction_to_ckb, read_command_payload, write_command_with_payload,
     DbCommandRequest, DbCommandResponse, InputCommand, OutputCommand, KV,
 };
-use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations};
-use crate::storage::db::StorageBatchRelatedOperations;
 use log::debug;
 
 use crate::{
diff --git a/light-client-lib/src/storage/db/mod.rs b/light-client-lib/src/storage/db/mod.rs
@@ -15,7 +15,6 @@ mod browser;
 #[cfg(target_arch = "wasm32")]
 pub use browser::{Batch, Storage};
 
-
 use crate::error::Result;
 use ckb_types::prelude::Reader;
 use ckb_types::prelude::{Builder, FromSliceShouldBeOk};
@@ -62,7 +61,7 @@ pub trait StorageHighLevelOperations {
     ///
     /// N.B. The specified block will be removed.
     fn rollback_to_block(&self, to_number: BlockNumber);
-
+    #[allow(clippy::type_complexity)]
     fn collect_iterator(
         &self,
         start_key_bound: Vec<u8>,
diff --git a/light-client-lib/src/storage/db/native_rocksdb.rs b/light-client-lib/src/storage/db/native_rocksdb.rs
@@ -539,7 +539,7 @@ impl StorageHighLevelOperations for Storage {
                     GeneralDirection::Reverse => Direction::Reverse,
                 },
             ))
-            .take_while(|(key, _)| take_while(&key))
+            .take_while(|(key, _)| take_while(key))
             .filter_map(|(key, value)| filter_map(&key).map(|v| (v.into_boxed_slice(), value)))
             .take(limit)
             .skip(skip)
diff --git a/light-client-lib/src/storage/mod.rs b/light-client-lib/src/storage/mod.rs
@@ -224,7 +224,9 @@ impl<S: StorageHighLevelOperations + Clone> CellDataProvider for StorageWithChai
 }
 
 #[cfg(not(target_arch = "wasm32"))]
-impl<S: StorageHighLevelOperations + CellDataProvider + Clone> CellDataProvider for StorageWithChainData<S> {
+impl<S: StorageHighLevelOperations + CellDataProvider + Clone> CellDataProvider
+    for StorageWithChainData<S>
+{
     fn get_cell_data(&self, out_point: &OutPoint) -> Option<Bytes> {
         self.storage.get_cell_data(out_point)
     }
diff --git a/light-client-lib/src/tests/protocols/block_filter.rs b/light-client-lib/src/tests/protocols/block_filter.rs
@@ -12,8 +12,9 @@ use ckb_types::{
     H256, U256,
 };
 
-use crate::storage::SetScriptsCommand;
 use crate::storage::db::StorageGeneralOperations;
+use crate::storage::db::StorageHighLevelOperations;
+use crate::storage::SetScriptsCommand;
 use crate::storage::{ScriptStatus, ScriptType};
 use crate::{
     protocols::{BAD_MESSAGE_BAN_TIME, GET_BLOCK_FILTERS_TOKEN},
@@ -22,7 +23,6 @@ use crate::{
         utils::{setup, MockChain, MockNetworkContext},
     },
 };
-use crate::storage::db::StorageHighLevelOperations;
 
 #[tokio::test]
 async fn test_block_filter_malformed_message() {
diff --git a/light-client-lib/src/tests/protocols/light_client/mod.rs b/light-client-lib/src/tests/protocols/light_client/mod.rs
@@ -10,13 +10,16 @@ use ckb_types::{
 
 use crate::{
     protocols::{
-        BAD_MESSAGE_BAN_TIME, PeerState, light_client::constant::{
+        light_client::constant::{
             GET_IDLE_BLOCKS_TOKEN, REFRESH_PEERS_DURATION, REFRESH_PEERS_TOKEN,
-        }
-    }, storage::db::StorageGeneralOperations, tests::{
+        },
+        PeerState, BAD_MESSAGE_BAN_TIME,
+    },
+    storage::db::StorageGeneralOperations,
+    tests::{
         prelude::*,
-        utils::{MockChain, MockNetworkContext, setup},
-    }
+        utils::{setup, MockChain, MockNetworkContext},
+    },
 };
 
 mod send_blocks_proof;
diff --git a/light-client-lib/src/tests/protocols/light_client/send_last_state_proof.rs b/light-client-lib/src/tests/protocols/light_client/send_last_state_proof.rs
@@ -1,19 +1,21 @@
 use std::{cmp, sync::Arc};
 
-use ckb_network::{CKBProtocolHandler, PeerIndex, SupportProtocols};
-use ckb_types::{
-    core::BlockNumber, packed, prelude::*, utilities::merkle_mountain_range::VerifiableHeader,
-    H256, U256,
+use crate::storage::db::{
+    StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations,
 };
-use log::debug;
-use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations};
 use crate::{
     protocols::{light_client::prelude::*, LastState, ProveRequest, ProveState, StatusCode},
     tests::{
         prelude::*,
         utils::{setup, MockChain, MockNetworkContext},
     },
 };
+use ckb_network::{CKBProtocolHandler, PeerIndex, SupportProtocols};
+use ckb_types::{
+    core::BlockNumber, packed, prelude::*, utilities::merkle_mountain_range::VerifiableHeader,
+    H256, U256,
+};
+use log::debug;
 
 fn sampling_between(start_number: BlockNumber, boundary_number: BlockNumber) -> Vec<BlockNumber> {
     let mut sampled_numbers = Vec::new();
diff --git a/light-client-lib/src/tests/protocols/light_client/send_transactions_proof.rs b/light-client-lib/src/tests/protocols/light_client/send_transactions_proof.rs
@@ -11,11 +11,14 @@ use ckb_types::{
 
 use crate::{
     protocols::{
-        FetchInfo, StatusCode, light_client::constant::{FETCH_HEADER_TX_TOKEN, REFRESH_PEERS_TOKEN}
-    }, storage::db::StorageGeneralOperations, tests::{
+        light_client::constant::{FETCH_HEADER_TX_TOKEN, REFRESH_PEERS_TOKEN},
+        FetchInfo, StatusCode,
+    },
+    storage::db::StorageGeneralOperations,
+    tests::{
         prelude::*,
         utils::{MockChain, MockNetworkContext},
-    }
+    },
 };
 
 #[tokio::test(flavor = "multi_thread")]
diff --git a/light-client-lib/src/tests/protocols/synchronizer.rs b/light-client-lib/src/tests/protocols/synchronizer.rs
@@ -7,14 +7,14 @@ use ckb_types::{
     prelude::*,
 };
 
+use crate::storage::db::StorageHighLevelOperations;
 use crate::{
-    storage::{ScriptStatus, ScriptType, db::StorageGeneralOperations},
+    storage::{db::StorageGeneralOperations, ScriptStatus, ScriptType},
     tests::{
         prelude::*,
         utils::{MockChain, MockNetworkContext},
     },
 };
-use crate::storage::db::StorageHighLevelOperations;
 
 #[tokio::test]
 async fn test_sync_add_block() {
diff --git a/light-client-lib/src/tests/storage.rs b/light-client-lib/src/tests/storage.rs
@@ -1,8 +1,10 @@
 use ckb_types::packed::Script;
 
 use crate::storage;
+use crate::storage::db::{
+    StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations,
+};
 use crate::tests::utils::new_storage;
-use crate::storage::db::{StorageGeneralOperations, StorageGetPinnedRelatedOperations, StorageHighLevelOperations};
 #[test]
 fn test_forget_update_min_filtred_number() {
     let (storage, _tmpdir) = new_storage("forget_update_min_filtred_block");
diff --git a/light-client-lib/src/tests/utils/chain.rs b/light-client-lib/src/tests/utils/chain.rs
@@ -10,8 +10,8 @@ use ckb_shared::{Shared, SharedBuilder};
 use ckb_types::{core, prelude::*};
 
 use crate::{
-    storage::{Storage, db::StorageBatchRelatedOperations},
-    tests::{ALWAYS_SUCCESS_SCRIPT, prelude::*},
+    storage::{db::StorageBatchRelatedOperations, Storage},
+    tests::{prelude::*, ALWAYS_SUCCESS_SCRIPT},
 };
 use tempfile::TempDir;
 
diff --git a/light-client-lib/src/tests/verify.rs b/light-client-lib/src/tests/verify.rs
@@ -6,12 +6,15 @@ use ckb_types::{
     prelude::{IntoHeaderView, IntoTransactionView as _},
 };
 
+use crate::storage::db::StorageHighLevelOperations;
 use crate::{
-    storage::{ScriptStatus, ScriptType, StorageWithChainData, db::{StorageBatchRelatedOperations, StorageGetPinnedRelatedOperations}},
+    storage::{
+        db::{StorageBatchRelatedOperations, StorageGetPinnedRelatedOperations},
+        ScriptStatus, ScriptType, StorageWithChainData,
+    },
     tests::{prelude::*, utils::MockChain},
     verify::verify_tx,
 };
-use crate::storage::db::StorageHighLevelOperations;
 
 #[test]
 fn verify_valid_transaction() {
diff --git a/wasm/light-client-wasm/src/lib.rs b/wasm/light-client-wasm/src/lib.rs
