Skip to content

Commit

Permalink
chore: Update Elsa dependency and correct import paths
Browse files Browse the repository at this point in the history
- Updated Elsa dependency branch from `sync_index_map` to `sync_frozen`.
- the elsa import now matches Manishearth/elsa#67 and thus a more recent version of elsa.

- Corrected the  import statement in `hash.rs`.
- Modified import paths for `FrozenIndexSet` in the `store.rs` and `lem/store.rs` files.
  • Loading branch information
huitseeker committed Nov 14, 2023
1 parent b65ded0 commit 930bf76
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ansi_term = "0.12.1"
tracing = { workspace = true }
tracing-texray = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
elsa = { version = "1.9.0", git = "https://github.com/lurk-lab/elsa", branch = "sync_index_map", features = ["indexmap"] }
elsa = { version = "1.9.0", git = "https://github.com/lurk-lab/elsa", branch = "sync_frozen", features = ["indexmap"] }
arc-swap = "1.6.0"

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/hash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::hash::Hash;
use std::sync::Arc;

use crate::field::{FWrap, LurkField};
use elsa::{sync::FrozenMap, sync_index_map::FrozenIndexMap};
use elsa::{sync::index_map::FrozenIndexMap, sync::FrozenMap};

use generic_array::typenum::{U3, U4, U6, U8};
use neptune::{poseidon::PoseidonConstants, Poseidon};
Expand Down
2 changes: 1 addition & 1 deletion src/lem/store.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use anyhow::{bail, Result};
use arc_swap::ArcSwap;
use elsa::{
sync::index_set::FrozenIndexSet,
sync::{FrozenMap, FrozenVec},
sync_index_set::FrozenIndexSet,
};
use indexmap::IndexSet;
use nom::{sequence::preceded, Parser};
Expand Down
2 changes: 1 addition & 1 deletion src/store.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use arc_swap::ArcSwap;
use elsa::sync::index_set::FrozenIndexSet;
use elsa::sync::{FrozenMap, FrozenVec};
use elsa::sync_index_set::FrozenIndexSet;
use once_cell::sync::OnceCell;
use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
use std::fmt;
Expand Down

0 comments on commit 930bf76

Please sign in to comment.