Merge pull request #23 from epi052/replace-mpsc-with-mpmc

replaced async fuzzer's mpsc with mpmc

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "feroxfuzz"
-version = "1.0.0-rc.9"
+version = "1.0.0-rc.10"
 edition = "2021"
 authors = ["Ben 'epi' Risher (@epi052)"]
 license = "Apache-2.0"
@@ -47,7 +47,7 @@ tokio = { version = "1.20", optional = true, features = [
 num = { version = "0.4" }
 cfg-if = { version = "1.0" }
 dyn-clone = { version = "1.0.9" }
-libafl = { version = "0.8.2", default-features = false, features = ["std"] }
+libafl = { version = "0.9.0", default-features = false, features = ["std"] }
 url = { version = "2.2", features = ["serde"] }
 ## optional
 serde = { version = "1.0", optional = true, features = ["derive", "rc"] }
@@ -63,8 +63,9 @@ regex = { version = "1.6" }
 serde_regex = { version = "1.1.0" }
 lazy_static = { version = "1.4" }
 futures = { version = "0.3", optional = true }
-base64 = { version = "0.13.0", optional = true }
+base64 = { version = "0.13.1", optional = true }
 hex = { version = "0.4.3", optional = true }
+flume = { version = "0.10.14" }
 
 [dev-dependencies]
 http = { version = "0.2" }

Makefile.toml

@@ -9,6 +9,10 @@ dependencies = ["upgrade-deps", "update"]
 [tasks.check]
 dependencies = ["clippy", "fmt", "test-lib", "test-doc", "doc"]
 
+[tasks.test]
+clear = true
+dependencies = ["test-doc", "test-lib"]
+
 # docs
 [tasks.doc]
 script = """
@@ -50,5 +54,5 @@ cargo test --all-features --doc "${@}"
 [tasks.test-lib]
 clear = true
 script = """
-cargo nextest run --all-features --lib "${@}"
+cargo nextest run --all-features --retries 10 --lib "${@}"
 """

src/deciders/mod.rs

@@ -117,7 +117,7 @@ where
         // take the current action that was decided upon via decide_with_request, and the
         // previously decided action (if any) to arrive at what should be returned as the
         // current decided action
-        let final_action = match (action, new_action, operation) {
+        match (action, new_action, operation) {
             (None, None, _) => None,
             (None, Some(new_action), _) => Some(new_action),
             (Some(old_action), None, _) => Some(old_action),
@@ -127,9 +127,7 @@ where
             (Some(old_action), Some(new_action), LogicOperation::Or) => {
                 Some(old_action | new_action)
             }
-        };
-
-        final_action
+        }
     }
 
     /// called after an [`HttpClient`] receives a [`Response`]
@@ -160,7 +158,7 @@ where
         // take the current action that was decided upon via decide_with_observers, and the
         // previously decided action (if any) to arrive at what should be returned as the
         // current decided action
-        let final_action = match (action, new_action, operation) {
+        match (action, new_action, operation) {
             (None, None, _) => None,
             (None, Some(new_action), _) => Some(new_action),
             (Some(old_action), None, _) => Some(old_action),
@@ -170,9 +168,7 @@ where
             (Some(old_action), Some(new_action), LogicOperation::Or) => {
                 Some(old_action | new_action)
             }
-        };
-
-        final_action
+        }
     }
 }