From 087fabffc42866e5bb1d22f51cea071e9cbebdff Mon Sep 17 00:00:00 2001 From: Nagaprasad V R <81755170+Nagaprasadvr@users.noreply.github.com> Date: Sat, 15 Feb 2025 12:27:46 +0530 Subject: [PATCH] fix : cargo clippy for rust-1.79 (#241) * fix : nft-ingester cargo clippy for rust-1.79 * update rust-toolchain to 1.79 * fix cargo clippy --- Cargo.lock | 4 ++-- digital_asset_types/src/dapi/change_logs.rs | 12 ++++-------- digital_asset_types/tests/common.rs | 3 +++ nft_ingester/src/backfiller.rs | 8 ++------ nft_ingester/src/plerkle.rs | 2 +- nft_ingester/src/tasks/mod.rs | 4 ++-- ops/src/bubblegum/tree.rs | 2 ++ program_transformers/src/bubblegum/db.rs | 2 +- rust-toolchain.toml | 2 +- 9 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6d440bf99..fda591f2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4939,9 +4939,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-serialize" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" +checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" [[package]] name = "rustc_version" diff --git a/digital_asset_types/src/dapi/change_logs.rs b/digital_asset_types/src/dapi/change_logs.rs index 7023ad12f..6eedbd793 100644 --- a/digital_asset_types/src/dapi/change_logs.rs +++ b/digital_asset_types/src/dapi/change_logs.rs @@ -200,22 +200,18 @@ fn build_asset_proof( tree_id: Vec, leaf_node_idx: i64, leaf_hash: Vec, - req_indexes: &Vec, + req_indexes: &[i64], required_nodes: &[SimpleChangeLog], ) -> AssetProof { let mut final_node_list = vec![SimpleChangeLog::default(); req_indexes.len()]; for node in required_nodes.iter() { if node.level < final_node_list.len().try_into().unwrap() { - final_node_list[node.level as usize] = node.to_owned(); + node.clone_into(&mut final_node_list[node.level as usize]) } } - for (i, (n, nin)) in final_node_list - .iter_mut() - .zip(req_indexes.clone()) - .enumerate() - { + for (i, (n, nin)) in final_node_list.iter_mut().zip(req_indexes).enumerate() { if *n == SimpleChangeLog::default() { - *n = make_empty_node(i as i64, nin, tree_id.clone()); + *n = make_empty_node(i as i64, *nin, tree_id.clone()); } } AssetProof { diff --git a/digital_asset_types/tests/common.rs b/digital_asset_types/tests/common.rs index 20989cf45..fd14a020e 100644 --- a/digital_asset_types/tests/common.rs +++ b/digital_asset_types/tests/common.rs @@ -31,9 +31,12 @@ pub struct MockMetadataArgs { /// Since we cannot easily change Metadata, we add the new DataV2 fields here at the end. pub token_standard: Option, /// Collection + #[allow(dead_code)] pub collection: Option, /// Uses + #[allow(dead_code)] pub uses: Option, + /// Creators pub creators: Vec, } diff --git a/nft_ingester/src/backfiller.rs b/nft_ingester/src/backfiller.rs index a8a4f1685..6679bb9c8 100644 --- a/nft_ingester/src/backfiller.rs +++ b/nft_ingester/src/backfiller.rs @@ -66,6 +66,7 @@ const BLOCK_CACHE_SIZE: usize = 300_000; const MAX_CACHE_COST: i64 = 32; const BLOCK_CACHE_DURATION: u64 = 172800; +#[allow(dead_code)] struct SlotSeq(u64, u64); /// Main public entry point for backfiller task. pub fn setup_backfiller( @@ -799,12 +800,7 @@ impl<'a, T: Messenger> Backfiller<'a, T> { .build(DbBackend::Postgres); let start_seq_vec = MaxSeqItem::find_by_statement(query).all(&self.db).await?; - let start_seq = if let Some(seq) = start_seq_vec.last().map(|row| row.seq) { - seq - } else { - 0 - }; - + let start_seq = start_seq_vec.last().map(|row| row.seq).unwrap_or_default(); // Get all rows for the tree that have not yet been backfilled. let mut query = backfill_items::Entity::find() .select_only() diff --git a/nft_ingester/src/plerkle.rs b/nft_ingester/src/plerkle.rs index bef3d4ff6..446f558b1 100644 --- a/nft_ingester/src/plerkle.rs +++ b/nft_ingester/src/plerkle.rs @@ -17,7 +17,7 @@ pub enum PlerkleDeserializerError { pub struct PlerkleAccountInfo<'a>(pub plerkle_serialization::AccountInfo<'a>); -impl<'a> TryFrom> for AccountInfo { +impl TryFrom> for AccountInfo { type Error = PlerkleDeserializerError; fn try_from(value: PlerkleAccountInfo) -> Result { diff --git a/nft_ingester/src/tasks/mod.rs b/nft_ingester/src/tasks/mod.rs index ec7a813fe..6c6f854b6 100644 --- a/nft_ingester/src/tasks/mod.rs +++ b/nft_ingester/src/tasks/mod.rs @@ -324,8 +324,8 @@ impl TaskManager { tokio::task::spawn(async move { while let Some(task) = receiver.recv().await { if let Some(task_created_time) = task.created_at { - let bus_time = - Utc::now().timestamp_millis() - task_created_time.timestamp_millis(); + let bus_time = Utc::now().timestamp_millis() + - task_created_time.and_utc().timestamp_millis(); metric! { statsd_histogram!("ingester.bgtask.bus_time", bus_time as u64, "type" => task.name); } diff --git a/ops/src/bubblegum/tree.rs b/ops/src/bubblegum/tree.rs index 09a3c92cb..1996057d1 100644 --- a/ops/src/bubblegum/tree.rs +++ b/ops/src/bubblegum/tree.rs @@ -171,6 +171,7 @@ impl TreeGapFill { } #[derive(Debug, Clone)] +#[allow(dead_code)] pub struct TreeHeaderResponse { pub max_depth: u32, pub max_buffer_size: u32, @@ -196,6 +197,7 @@ impl TryFrom for TreeHeaderResponse { #[derive(Debug, Clone)] pub struct TreeResponse { pub pubkey: Pubkey, + #[allow(dead_code)] pub tree_header: TreeHeaderResponse, pub seq: u64, } diff --git a/program_transformers/src/bubblegum/db.rs b/program_transformers/src/bubblegum/db.rs index b086c6de8..f10546e9d 100644 --- a/program_transformers/src/bubblegum/db.rs +++ b/program_transformers/src/bubblegum/db.rs @@ -529,7 +529,7 @@ where pub async fn upsert_asset_creators( txn: &T, id: Vec, - creators: &Vec, + creators: &[Creator], slot_updated: i64, seq: i64, ) -> ProgramTransformerResult<()> diff --git a/rust-toolchain.toml b/rust-toolchain.toml index eb84afdfc..402b06845 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.75.0" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = [] profile = "minimal"