Migrate NopExecutor used in tests to ConstExecutor (#3129)

libafl/src/executors/mod.rs

@@ -230,77 +230,28 @@ pub fn common_signals() -> Vec<Signal> {
 #[cfg(test)]
 /// Tester for executor
 pub mod test {
-    use core::marker::PhantomData;
-
-    use libafl_bolts::{AsSlice, Error};
-
+    use super::nop::NopExecutor;
     use crate::{
         events::NopEventManager,
         executors::{Executor, ExitKind},
         fuzzer::NopFuzzer,
-        inputs::{BytesInput, HasTargetBytes},
-        state::{HasExecutions, NopState},
+        inputs::BytesInput,
+        state::NopState,
     };
 
-    /// A simple executor that does nothing.
-    /// If intput len is 0, `run_target` will return Err
-    #[derive(Debug)]
-    pub struct NopExecutor<S> {
-        phantom: PhantomData<S>,
-    }
-
-    impl<S> NopExecutor<S> {
-        /// Creates a new [`NopExecutor`]
-        #[must_use]
-        pub fn new() -> Self {
-            Self {
-                phantom: PhantomData,
-            }
-        }
-    }
-
-    impl<S> Default for NopExecutor<S> {
-        fn default() -> Self {
-            Self::new()
-        }
-    }
-
-    impl<EM, I, S, Z> Executor<EM, I, S, Z> for NopExecutor<S>
-    where
-        S: HasExecutions,
-        I: HasTargetBytes,
-    {
-        fn run_target(
-            &mut self,
-            _fuzzer: &mut Z,
-            state: &mut S,
-            _mgr: &mut EM,
-            input: &I,
-        ) -> Result<ExitKind, Error> {
-            *state.executions_mut() += 1;
-
-            if input.target_bytes().as_slice().is_empty() {
-                Err(Error::empty("Input Empty"))
-            } else {
-                Ok(ExitKind::Ok)
-            }
-        }
-    }
-
     #[test]
     fn nop_executor() {
         let empty_input = BytesInput::new(vec![]);
-        let nonempty_input = BytesInput::new(vec![1u8]);
-        let mut executor = NopExecutor::new();
+        let mut executor = NopExecutor::ok();
         let mut fuzzer = NopFuzzer::new();
         let mut mgr: NopEventManager = NopEventManager::new();
         let mut state: NopState<BytesInput> = NopState::new();
 
+        assert_eq!(
             executor
                 .run_target(&mut fuzzer, &mut state, &mut mgr, &empty_input)
-            .unwrap_err();
-        executor
-            .run_target(&mut fuzzer, &mut state, &mut mgr, &nonempty_input)
-            .unwrap();
+                .unwrap(),
+            ExitKind::Ok
+        );
     }
 }

libafl/src/stages/logics.rs

@@ -312,7 +312,7 @@ mod test {
     use crate::{
         HasMetadata, NopFuzzer,
         events::NopEventManager,
-        executors::test::NopExecutor,
+        executors::nop::NopExecutor,
         stages::{
             ClosureStage, CorpusId, HasCurrentCorpusId, IfElseStage, IfStage, Restartable, Stage,
             StagesTuple, WhileStage,
@@ -456,7 +456,7 @@ mod test {
 
     pub fn test_resume<ST, S>(completed: &Rc<RefCell<bool>>, state: &mut S, mut stages: ST)
     where
-        ST: StagesTuple<NopExecutor<S>, NopEventManager, S, NopFuzzer>,
+        ST: StagesTuple<NopExecutor, NopEventManager, S, NopFuzzer>,
         S: HasCurrentStageId + HasCurrentCorpusId,
     {
         #[cfg(any(not(feature = "serdeany_autoreg"), miri))]
@@ -466,7 +466,7 @@ mod test {
         }
 
         let mut fuzzer = NopFuzzer::new();
-        let mut executor = NopExecutor::new();
+        let mut executor = NopExecutor::ok();
         let mut manager = NopEventManager::new();
         for _ in 0..2 {
             completed.replace(false);