Skip to content

Commit d1d7b6b

Browse files
wtdcodewtdcode
committed
clippy
1 parent 162398c commit d1d7b6b

30 files changed

Lines changed: 53 additions & 68 deletions

File tree

‎crates/movy-fuzz/src/executor.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use libafl::{
77
state::{HasExecutions, HasRand},
88
};
99
use libafl_bolts::tuples::{Handle, MatchNameRef, RefIndexable};
10-
use tracing::trace;
1110
use movy_replay::{
1211
db::{ObjectStoreInfo, ObjectStoreMintObject},
1312
exec::{ExecutionTracedResults, SuiExecutor},
@@ -24,6 +23,7 @@ use sui_types::{
2423
execution_status::ExecutionStatus,
2524
storage::{BackingStore, ObjectStore},
2625
};
26+
use tracing::trace;
2727

2828
use crate::{
2929
input::MoveInput,
@@ -154,7 +154,7 @@ where
154154
ExecutionStatus::Failure { command, .. } => (
155155
// command index may be out of bound when meeting non-aborted error
156156
if command.is_some_and(|c| c < input.sequence().commands.len()) {
157-
command.clone()
157+
*command
158158
} else {
159159
None
160160
},

‎crates/movy-fuzz/src/meta.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use color_eyre::eyre::eyre;
88
use itertools::Itertools;
99
use libafl::{HasMetadata, state::HasRand};
1010
use libafl_bolts::{impl_serdeany, rands::Rand};
11-
use tracing::debug;
1211
use movy_replay::{
1312
db::{ObjectStoreCachedStore, ObjectStoreInfo},
1413
env::SuiTestingEnv,
@@ -19,14 +18,15 @@ use movy_types::abi::MoveAbiSignatureToken;
1918
use movy_types::{
2019
abi::{
2120
MoveAbility, MoveFunctionAbi, MoveFunctionVisibility, MoveModuleAbi, MoveModuleId,
22-
MovePackageAbi, MoveStructAbi,
21+
MovePackageAbi,
2322
},
2423
error::MovyError,
2524
input::{FunctionIdent, MoveAddress, MoveTypeTag},
2625
};
2726
use serde::{Deserialize, Serialize};
2827
use serde_json_any_key::any_key_map;
2928
use sui_types::storage::{BackingPackageStore, BackingStore, ObjectStore};
29+
use tracing::debug;
3030

3131
use crate::{r#const::INIT_FUNCTION_SCORE, utils::SuperRand};
3232

‎crates/movy-fuzz/src/mutators/arg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ use libafl::{
66
state::HasRand,
77
};
88
use libafl_bolts::{Named, rands::Rand};
9-
use tracing::{debug, trace};
109
use movy_replay::tracer::{concolic::ConcolicState, op::Log};
1110
use movy_types::input::{FunctionIdent, MoveSequenceCall, SequenceArgument};
11+
use tracing::{debug, trace};
1212

1313
use crate::{
1414
flash::FlashProvider,

‎crates/movy-fuzz/src/mutators/havoc.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use libafl::{
55
state::HasRand,
66
};
77
use libafl_bolts::{Named, rands::Rand};
8-
use tracing::debug;
98
use movy_replay::db::ObjectStoreInfo;
109
use movy_types::input::{
1110
InputArgument, MoveCall, MoveSequenceCall, SequenceArgument, SuiObjectInputArgument,
1211
};
1312
use movy_types::object::MoveOwner as Owner;
1413
use sui_types::digests::TransactionDigest;
14+
use tracing::debug;
1515

1616
use crate::{
1717
input::MoveInput,

‎crates/movy-fuzz/src/mutators/object_data.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use itertools::Itertools;
22
use libafl::state::HasRand;
33
use libafl_bolts::rands::Rand;
4-
use tracing::{debug, trace, warn};
54
use movy_replay::db::ObjectStoreInfo;
65
use movy_types::object::MoveOwner as Owner;
76
use movy_types::{
@@ -14,6 +13,7 @@ use movy_types::{
1413
use serde::{Deserialize, Serialize};
1514
use std::collections::{BTreeMap, BTreeSet};
1615
use sui_types::digests::TransactionDigest;
16+
use tracing::{debug, trace, warn};
1717

1818
use crate::{
1919
r#const::{INIT_FUNCTION_SCORE, SCORE_TICK},

‎crates/movy-fuzz/src/mutators/sequence.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use libafl::{
66
state::HasRand,
77
};
88
use libafl_bolts::{Named, rands::Rand};
9-
use tracing::debug;
109
use movy_types::input::{MoveSequence, MoveSequenceCall, SequenceArgument};
10+
use tracing::debug;
1111

1212
use crate::{
1313
r#const::{ADD_MOVECALL_PROB, INIT_FUNCTION_SCORE},

‎crates/movy-fuzz/src/mutators/sequence/append.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ use std::collections::{BTreeMap, BTreeSet};
22

33
use libafl::state::HasRand;
44
use libafl_bolts::rands::Rand;
5-
use tracing::debug;
65
use movy_types::{
76
abi::MoveAbiSignatureToken,
87
input::{
98
FunctionIdent, InputArgument, MoveAddress, MoveCall, MoveSequence, MoveSequenceCall,
109
MoveTypeTag, SequenceArgument,
1110
},
1211
};
12+
use tracing::debug;
1313

1414
use crate::{
1515
meta::HasFuzzMetadata,

‎crates/movy-fuzz/src/mutators/sequence/hooks.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use std::collections::{BTreeMap, BTreeSet};
22

3-
use tracing::{debug, warn};
43
use movy_types::{
54
abi::MoveFunctionAbi,
65
input::{
76
FunctionIdent, MoveCall, MoveSequence, MoveSequenceCall, MoveTypeTag, SequenceArgument,
87
},
98
};
9+
use tracing::{debug, warn};
1010

1111
use crate::{
1212
meta::{FunctionHook, FuzzMetadata, HasFuzzMetadata},
@@ -105,14 +105,13 @@ fn append_hook_call<S>(
105105
let mut fixed_args: BTreeMap<u16, (SequenceArgument, MoveTypeTag)> = BTreeMap::new();
106106
let mut fixed_ty_args: BTreeMap<u16, MoveTypeTag> = BTreeMap::new();
107107
let param_offset = if ctx_arg.is_some() { 1 } else { 0 };
108-
if let Some(ctx) = ctx_arg {
109-
if let Some(param_ty) = hook_abi
108+
if let Some(ctx) = ctx_arg
109+
&& let Some(param_ty) = hook_abi
110110
.parameters
111-
.get(0)
111+
.first()
112112
.and_then(|p| p.subst(&BTreeMap::new()))
113-
{
114-
fixed_args.insert(0, (ctx, param_ty));
115-
}
113+
{
114+
fixed_args.insert(0, (ctx, param_ty));
116115
}
117116
if let Some((target_call, target_abi, _maybe_idx)) = target {
118117
// Hook must mirror the target function signature (plus optional context).
@@ -179,7 +178,7 @@ fn append_hook_call<S>(
179178
.arguments
180179
.get(i)
181180
.cloned()
182-
.unwrap_or_else(|| SequenceArgument::Input(0));
181+
.unwrap_or(SequenceArgument::Input(0));
183182
fixed_args.insert((param_offset + i) as u16, (arg, hook_ty));
184183
}
185184
}

‎crates/movy-fuzz/src/mutators/utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use std::hash::{Hash, Hasher};
22

33
use libafl::{mutators::MutationResult, state::HasRand};
44
use libafl_bolts::rands::Rand;
5-
use tracing::{debug, warn};
65
use movy_types::{
76
abi::MoveFunctionAbi,
87
input::{FunctionIdent, MoveCall, MoveSequence, MoveSequenceCall, SequenceArgument},
98
};
9+
use tracing::{debug, warn};
1010

1111
use crate::{
1212
executor::ExecutionExtraOutcome,

‎crates/movy-fuzz/src/operations/sui_fuzz.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ use libafl::{
2525
state::StdState,
2626
};
2727
use libafl_bolts::tuples::tuple_list;
28-
use tracing::{info, warn};
2928
use movy_replay::db::{ObjectStoreCachedStore, ObjectStoreInfo};
3029
use movy_replay::env::SuiTestingEnv;
3130
use movy_replay::exec::SuiExecutor;
@@ -34,6 +33,7 @@ use movy_sui::database::cache::{CachedStore, ObjectSuiStoreCommit};
3433
use movy_types::error::MovyError;
3534
use sui_types::storage::BackingStore;
3635
use sui_types::storage::{BackingPackageStore, ObjectStore};
36+
use tracing::{info, warn};
3737

3838
pub fn oracles<T, S, E>(
3939
typed_bug_abort: bool,

0 commit comments

Comments
 (0)