feat: update to new Merkle tree API (#301)

succinctlabs · Feb 26, 2024 · 2f852ff · 2f852ff
1 parent c406f93
commit 2f852ff
Show file tree

Hide file tree

Showing 15 changed files with 305 additions and 294 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,22 +15,22 @@ debug = true
 debug-assertions = true
 
 [workspace.dependencies]
-p3-air = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-field = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-commit = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-matrix = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-baby-bear = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-util = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-challenger = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-dft = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-fri = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-goldilocks = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-keccak = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-keccak-air = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-blake3 = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-mds = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-merkle-tree = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-poseidon2 = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-symmetric = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-uni-stark = { git = "https://github.com/succinctlabs/plonky3.git" }
-p3-maybe-rayon = { git = "https://github.com/succinctlabs/plonky3.git" }
+p3-air = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-field = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-commit = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-matrix = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-baby-bear = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-util = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-challenger = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-dft = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-fri = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-goldilocks = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-keccak = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-keccak-air = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-blake3 = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-mds = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-merkle-tree = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-poseidon2 = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-symmetric = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-uni-stark = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
+p3-maybe-rayon = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
diff --git a/core/src/stark/quotient.rs b/core/src/stark/quotient.rs
@@ -8,7 +8,7 @@ use p3_air::TwoRowMatrixView;
 use p3_commit::UnivariatePcsWithLde;
 use p3_field::AbstractExtensionField;
 use p3_field::AbstractField;
-use p3_field::PackedField;
+use p3_field::PackedValue;
 use p3_field::{cyclic_subgroup_coset_known_order, Field, TwoAdicField};
 use p3_matrix::MatrixGet;
 use p3_maybe_rayon::prelude::*;