From 4dca6485d70660996a031d844d33a581d52abdc8 Mon Sep 17 00:00:00 2001
From: stefan-mysten <135084671+stefan-mysten@users.noreply.github.com>
Date: Tue, 25 Feb 2025 18:12:04 -0800
Subject: [PATCH] Fix clippy & test

---
 crates/sui-move-build/src/lib.rs  |  2 +-
 crates/sui/src/client_commands.rs | 15 +++------------
 crates/sui/tests/cli_tests.rs     |  2 +-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/crates/sui-move-build/src/lib.rs b/crates/sui-move-build/src/lib.rs
index e935e7023c936..34b9c8256713b 100644
--- a/crates/sui-move-build/src/lib.rs
+++ b/crates/sui-move-build/src/lib.rs
@@ -673,7 +673,7 @@ impl CompiledPackage {
             .clone()
             .published
             .into_iter()
-            .filter(|(pkg_name, _)| pkgs_to_keep.contains(&pkg_name))
+            .filter(|(pkg_name, _)| pkgs_to_keep.contains(pkg_name))
             .collect())
     }
 }
diff --git a/crates/sui/src/client_commands.rs b/crates/sui/src/client_commands.rs
index b0a381a4e52f8..d540d6dd9e0c7 100644
--- a/crates/sui/src/client_commands.rs
+++ b/crates/sui/src/client_commands.rs
@@ -1780,7 +1780,7 @@ async fn compile_package_simple(
     let resolution_graph = config.resolution_graph(package_path, chain_id.clone())?;
     let mut compiled_package =
         build_from_resolution_graph(resolution_graph, false, false, chain_id)?;
-    pkg_tree_shake(&client, false, &mut compiled_package).await?;
+    pkg_tree_shake(client, false, &mut compiled_package).await?;
 
     Ok(compiled_package)
 }
@@ -1803,12 +1803,7 @@ pub(crate) async fn upgrade_package(
     )
     .await?;
 
-    pkg_tree_shake(
-        &client,
-        with_unpublished_dependencies,
-        &mut compiled_package,
-    )
-    .await?;
+    pkg_tree_shake(client, with_unpublished_dependencies, &mut compiled_package).await?;
 
     compiled_package.published_at.as_ref().map_err(|e| match e {
         PublishedAtError::NotPresent => {
@@ -3144,11 +3139,7 @@ async fn pkg_tree_shake(
     compiled_package: &mut CompiledPackage,
 ) -> Result<(), anyhow::Error> {
     let pkgs = compiled_package.find_immediate_deps_pkgs_to_keep(with_unpublished_dependencies)?;
-    let pkg_ids = pkgs
-        .clone()
-        .into_iter()
-        .map(|(_, id)| id)
-        .collect::<Vec<_>>();
+    let pkg_ids: Vec<_> = pkgs.clone().into_values().collect();
 
     let pkg_name_to_orig_id: BTreeMap<_, _> = compiled_package
         .package
diff --git a/crates/sui/tests/cli_tests.rs b/crates/sui/tests/cli_tests.rs
index 3b80cb4b8fd2a..1e97a1b793246 100644
--- a/crates/sui/tests/cli_tests.rs
+++ b/crates/sui/tests/cli_tests.rs
@@ -1879,7 +1879,7 @@ async fn test_package_publish_nonexistent_dependency() -> Result<(), anyhow::Err
 
     let err = result.unwrap_err().to_string();
     assert!(
-        err.contains("Dependency object does not exist or was deleted"),
+        err.contains("Object 0x0000000000000000000000000000000000000000000000000000000000abc123 does not exist"),
         "{}",
         err
     );