fix: re-enable foldhash by default, but exclude it from zkvm (#777)

alloy-rs · Oct 21, 2024 · 0ba6265 · 0ba6265
1 parent 9c53778
commit 0ba6265
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml
@@ -60,6 +60,7 @@ tiny-keccak = ["alloy-primitives/tiny-keccak"]
 map = ["alloy-primitives/map"]
 map-hashbrown = ["alloy-primitives/map-hashbrown"]
 map-indexmap = ["alloy-primitives/map-indexmap"]
+map-foldhash = ["alloy-primitives/map-foldhash"]
 map-fxhash = ["alloy-primitives/map-fxhash"]
 
 getrandom = ["alloy-primitives/getrandom"]

diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
@@ -95,7 +95,7 @@ criterion.workspace = true
 serde_json.workspace = true
 
 [features]
-default = ["std", "map"]
+default = ["std", "map", "map-foldhash"]
 std = [
     "bytes/std",
     "hex/std",

diff --git a/crates/primitives/src/map/mod.rs b/crates/primitives/src/map/mod.rs
@@ -115,7 +115,8 @@ cfg_if! {
 
 // Default hasher.
 cfg_if! {
-    if #[cfg(feature = "map-foldhash")] {
+    // TODO: Use `foldhash` in zkVM when it's supported.
+    if #[cfg(all(feature = "map-foldhash", not(target_os = "zkvm")))] {
         type DefaultHashBuilderInner = foldhash::fast::RandomState;
     } else if #[cfg(feature = "map-fxhash")] {
         type DefaultHashBuilderInner = FxBuildHasher;