Update ahash in fuzz and make equivalence 100% deterministic

Signed-off-by: Jakub Sztandera <[email protected]>

Author: Kubuxu

ipld/amt/fuzz/Cargo.toml

@@ -11,7 +11,8 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.3"
 arbitrary = { version = "0.4", features = ["derive"] }
-ahash = "0.6"
+ahash = "0.7.6"
+itertools = "0.10.3"
 
 cid = { version = "0.8.2", default-features = false, features = ["serde-codec"] }
 

ipld/amt/fuzz/fuzz_targets/equivalence.rs

@@ -6,6 +6,7 @@ use arbitrary::Arbitrary;
 use fvm_ipld_amt::{Amt, MAX_INDEX};
 use libfuzzer_sys::fuzz_target;
 use cid::Cid;
+use itertools::Itertools;
 
 
 #[derive(Debug, Arbitrary)]
@@ -58,11 +59,10 @@ fn execute(ops: Vec<Operation>) -> (Cid, ahash::AHashMap<u64, u64>) {
 fuzz_target!(|ops: Vec<Operation>| {
     let (res_cid, m) = execute(ops);
 
-    let simplified_ops = m.iter().map(|(k ,v)| {
+    let simplified_ops = m.iter().sorted_by_key(|(_, v)| *v).map(|(k ,v)| {
         Operation{idx: *k, method: Method::Insert(*v)}
     }).collect();
 
     let (simplified_cid, _) = execute(simplified_ops);
-
     assert_eq!(res_cid, simplified_cid)
 });

ipld/hamt/fuzz/Cargo.toml

@@ -11,7 +11,7 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.3"
 arbitrary = { version = "0.4", features = ["derive"] }
-ahash = "0.6"
+ahash = "0.7.6"
 
 fvm_ipld_hamt = { path = ".." }
 fvm_shared = { path = "../../../shared" }