fix tests

a16z · Aug 23, 2024 · dbd4661 · dbd4661
1 parent fb1dbd5
commit dbd4661
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git a/jolt-core/src/jolt/instruction/test.rs b/jolt-core/src/jolt/instruction/test.rs
@@ -7,7 +7,7 @@
 /// 4. Checks that the result equals the expected value, given by the `lookup_output`
 macro_rules! jolt_instruction_test {
     ($instr:expr) => {
-        use $crate::field::JoltField;
+        use jolt_types::field::JoltField;
 
         let subtable_lookup_indices = $instr.to_indices(C, ark_std::log2(M) as usize);
 

diff --git a/jolt-core/src/jolt/subtable/test.rs b/jolt-core/src/jolt/subtable/test.rs
@@ -14,7 +14,7 @@ macro_rules! subtable_materialize_mle_parity_test {
             for i in 0..M {
                 assert_eq!(
                     materialized[i],
-                    subtable.evaluate_mle(&$crate::utils::index_to_field_bitvector(i, log_M)),
+                    subtable.evaluate_mle(&jolt_types::utils::index_to_field_bitvector(i, log_M)),
                     "MLE did not match materialized subtable at index {}",
                     i
                 );

diff --git a/jolt-core/src/lasso/surge.rs b/jolt-core/src/lasso/surge.rs
@@ -788,9 +788,9 @@ mod tests {
         jolt::instruction::xor::XORInstruction,
         lasso::surge::SurgeProof,
         poly::{commitment::hyrax::HyraxScheme, commitment::pedersen::PedersenGenerators},
-        utils::transcript::ProofTranscript,
     };
     use ark_bn254::{Fr, G1Projective};
+    use jolt_types::utils::transcript::ProofTranscript;
 
     #[test]
     fn e2e() {

diff --git a/jolt-core/src/poly/commitment/mock.rs b/jolt-core/src/poly/commitment/mock.rs
@@ -2,7 +2,8 @@ use std::marker::PhantomData;
 
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 
-use crate::{field::JoltField, poly::dense_mlpoly::DensePolynomial};
+use crate::poly::dense_mlpoly::DensePolynomial;
+use jolt_types::field::JoltField;
 use jolt_types::utils::{
     errors::ProofVerifyError,
     transcript::{AppendToTranscript, ProofTranscript},

diff --git a/jolt-core/src/r1cs/key.rs b/jolt-core/src/r1cs/key.rs
@@ -439,9 +439,8 @@ mod test {
                 materialize_full_uniform, simp_test_big_matrices, simp_test_builder_key, TestInputs,
             },
         },
-        utils::index_to_field_bitvector,
     };
-    use jolt_types::utils::math::Math;
+    use jolt_types::utils::{index_to_field_bitvector, math::Math};
     use strum::EnumCount;
 
     #[test]

diff --git a/jolt-core/src/r1cs/test.rs b/jolt-core/src/r1cs/test.rs
@@ -1,8 +1,8 @@
 use crate::{
-    field::JoltField,
     impl_r1cs_input_lc_conversions,
     r1cs::builder::{OffsetEqConstraint, R1CSBuilder, R1CSConstraintBuilder},
 };
+use jolt_types::field::JoltField;
 
 use super::{
     builder::CombinedUniformBuilder,

diff --git a/jolt-sdk/Cargo.toml b/jolt-sdk/Cargo.toml
@@ -42,5 +42,6 @@ ark-serialize = { version = "0.4.2", features = ["derive"], optional = true }
 
 jolt-sdk-macros = { path = "./macros" }
 jolt-core = { path = "../jolt-core", optional = true }
+jolt-types = { path = "../jolt-types" }
 tracer = { path = "../tracer", optional = true }
 common = { path = "../common", optional = true }
diff --git a/jolt-sdk/src/host_utils.rs b/jolt-sdk/src/host_utils.rs
@@ -1,6 +1,7 @@
 pub use ark_bn254::{Fr as F, G1Projective as G};
 pub use ark_ec::CurveGroup;
-pub use jolt_core::{field::JoltField, poly::commitment::hyrax::HyraxScheme};
+pub use jolt_core::poly::commitment::hyrax::HyraxScheme;
+pub use jolt_types::field::JoltField;
 
 pub use common::{
     constants::MEMORY_OPS_PER_INSTRUCTION,