clippy

Author: wtdcode

crates/movy-replay/src/env.rs

@@ -31,7 +31,7 @@ use sui_types::{
 use crate::{
     db::{ObjectStoreCachedStore, ObjectStoreInfo},
     exec::SuiExecutor,
-    tracer::{NopTracer, tree::TreeTracer},
+    tracer::tree::TreeTracer,
 };
 
 pub struct SuiTestingEnv<T> {
@@ -202,11 +202,8 @@ impl<
                     gas,
                     tracer,
                 )?;
-                let trace = if let Some(tracer) = std::mem::take(&mut results.tracer) {
-                    Some(tracer.take_inner().pprint())
-                } else {
-                    None
-                };
+                let trace =
+                    std::mem::take(&mut results.tracer).map(|tracer| tracer.take_inner().pprint());
                 if !results.effects.status().is_ok() {
                     if let Some(trace) = trace {
                         tracing::error!("movy_init reverts with:\n{}", trace);

crates/movy-replay/src/exec.rs

@@ -2,7 +2,6 @@ use std::{ops::Deref, str::FromStr, sync::Arc};
 
 use color_eyre::eyre::eyre;
 use itertools::Itertools;
-use move_core_types::account_address::AccountAddress;
 use move_trace_format::{format::MoveTraceBuilder, interface::Tracer};
 use move_vm_runtime::move_vm::MoveVM;
 use movy_sui::{compile::SuiCompiledPackage, database::cache::ObjectSuiStoreCommit};
@@ -288,7 +287,7 @@ where
                 .iter()
                 .map(|v| {
                     let id = v.self_id();
-                    format!("{}:{}", id.address().to_string(), id.name().to_string())
+                    format!("{}:{}", id.address(), id.name())
                 })
                 .join(",")
         );

crates/movy-sui/src/cheats/backend.rs

@@ -22,10 +22,10 @@ impl CheatBackendInner {
 
         for (id, mp) in storage.objects.iter() {
             for (_, obj) in mp.iter() {
-                if let Some(obj) = obj {
-                    if let Some(ty) = obj.type_() {
-                        tys.entry(ty.clone()).or_default().insert(*id);
-                    }
+                if let Some(obj) = obj
+                    && let Some(ty) = obj.type_()
+                {
+                    tys.entry(ty.clone()).or_default().insert(*id);
                 }
             }
         }

crates/movy-sui/src/cheats/mod.rs

@@ -1,10 +1,6 @@
 use std::{str::FromStr, sync::LazyLock};
 
 use move_core_types::account_address::AccountAddress;
-use move_vm_runtime::native_functions::NativeFunctionTable;
-use sui_types::Identifier;
-
-use crate::{cheats::backend::CheatBackend, database::cache::CachedSnapshot};
 
 pub mod backend;
 pub mod ctx;

crates/movy-sui/src/compile.rs

@@ -1,9 +1,4 @@
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fmt::Display,
-    io::Write,
-    path::{Path, PathBuf},
-};
+use std::{collections::BTreeSet, fmt::Display, io::Write, path::Path};
 
 use color_eyre::eyre::eyre;
 use itertools::Itertools;
@@ -295,7 +290,7 @@ impl SuiCompiledPackage {
             }
             // mock module self address
             for md in modules.iter_mut() {
-                mock_module_address(root_address.into(), md);
+                mock_module_address(root_address, md);
             }
         }
 

crates/movy/src/sui/deploy.rs

@@ -1,9 +1,8 @@
-use std::{path::PathBuf, str::FromStr};
+use std::str::FromStr;
 
 use clap::Args;
 use movy_replay::{db::ObjectStoreMintObject, env::SuiTestingEnv};
 use movy_sui::{
-    compile::SuiCompiledPackage,
     database::{cache::CachedStore, empty::EmptyStore, graphql::GraphQlDatabase},
     rpc::graphql::GraphQlClient,
     utils::TrivialBackStore,
@@ -43,7 +42,7 @@ impl SuiBuildDeployArgs {
         let inner = if self.graphql {
             TrivialBackStore::T1(gdb.clone())
         } else {
-            TrivialBackStore::T2(EmptyStore::default())
+            TrivialBackStore::T2(EmptyStore)
         };
         let env = CachedStore::new(inner);
         let gas_id = ObjectID::random_from_rng(&mut rand);

crates/movy/src/sui/env.rs

@@ -11,7 +11,6 @@ use movy_replay::{
 use movy_sui::{
     compile::SuiCompiledPackage,
     database::{cache::ObjectSuiStoreCommit, graphql::GraphQlDatabase},
-    rpc::graphql::GraphQlClient,
 };
 use movy_types::{
     abi::{MoveModuleId, MovePackageAbi},
@@ -101,8 +100,7 @@ impl SuiTargetArgs {
         let mut local_name_map = BTreeMap::new();
 
         for onchain in self.onchains.iter().flatten() {
-            env.deploy_package_at_address((*onchain).into(), rpc)
-                .await?;
+            env.deploy_package_at_address((*onchain), rpc).await?;
             target_packages.push(*onchain);
         }
 

crates/movy/src/sui/fuzz.rs

@@ -5,7 +5,6 @@ use color_eyre::eyre::eyre;
 use movy_fuzz::{
     meta::{FuzzMetadata, TargetFilters},
     operations::sui_fuzz,
-    utils::{SuperRand, random_seed},
 };
 use movy_replay::{
     db::{ObjectStoreCachedStore, ObjectStoreInfo, ObjectStoreMintObject},
@@ -186,7 +185,7 @@ impl SuiFuzzArgs {
         let inner = if self.graphql_deployment {
             TrivialBackStore::T1(graphql_db.clone())
         } else {
-            TrivialBackStore::T2(EmptyStore::default())
+            TrivialBackStore::T2(EmptyStore)
         };
         let env = CachedStore::new(inner);
         let gas_id = ObjectID::random_from_rng(&mut rand);
@@ -291,7 +290,7 @@ impl SuiFuzzArgs {
                 primitives.checkpoint,
             ))
         } else {
-            TrivialBackStore::T2(EmptyStore::default())
+            TrivialBackStore::T2(EmptyStore)
         };
         let store = CachedStore::new(inner);
         store.restore_snapshot(dump);