diff --git a/crates/compute/test_utils/src/lib.rs b/crates/compute/test_utils/src/lib.rs index bd8487b20..ecf7a39c7 100644 --- a/crates/compute/test_utils/src/lib.rs +++ b/crates/compute/test_utils/src/lib.rs @@ -1,6 +1,3 @@ // Copyright 2025 Irreducible Inc. -pub mod bivariate_sumcheck; pub mod layer; -pub mod piop; -pub mod ring_switch; diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index f1d6233cd..04fc1dc44 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -38,6 +38,7 @@ tracing-profile.workspace = true [dev-dependencies] binius_compute_test_utils = { path = "../compute/test_utils", default-features = false } +binius_core_test_utils = { path = "test_utils", default-features = false } binius_macros = { path = "../macros", default-features = false } criterion.workspace = true proptest.workspace = true diff --git a/crates/core/src/protocols/sumcheck/v3/bivariate_mlecheck.rs b/crates/core/src/protocols/sumcheck/v3/bivariate_mlecheck.rs index a88b2a5da..b8c78fc36 100644 --- a/crates/core/src/protocols/sumcheck/v3/bivariate_mlecheck.rs +++ b/crates/core/src/protocols/sumcheck/v3/bivariate_mlecheck.rs @@ -521,7 +521,7 @@ fn calculate_round_evals<'a, F: TowerField, Hal: ComputeLayer>( #[cfg(test)] mod tests { use binius_compute::cpu::layer::CpuLayerHolder; - use binius_compute_test_utils::bivariate_sumcheck::generic_test_bivariate_mlecheck_prove_verify; + use binius_core_test_utils::bivariate_sumcheck::generic_test_bivariate_mlecheck_prove_verify; use binius_fast_compute::layer::FastCpuLayerHolder; use binius_field::{ arch::OptimalUnderlier, as_packed_field::PackedType, tower::CanonicalTowerFamily, diff --git a/crates/core/src/protocols/sumcheck/v3/bivariate_product.rs b/crates/core/src/protocols/sumcheck/v3/bivariate_product.rs index e99abcebd..950fb3101 100644 --- a/crates/core/src/protocols/sumcheck/v3/bivariate_product.rs +++ b/crates/core/src/protocols/sumcheck/v3/bivariate_product.rs @@ -433,7 +433,7 @@ pub enum PhaseState { #[cfg(test)] mod tests { use binius_compute::cpu::layer::CpuLayerHolder; - use binius_compute_test_utils::bivariate_sumcheck::{ + use binius_core_test_utils::bivariate_sumcheck::{ generic_test_bivariate_sumcheck_prove_verify, generic_test_calculate_round_evals, }; use binius_fast_compute::layer::FastCpuLayerHolder; diff --git a/crates/core/test_utils/Cargo.toml b/crates/core/test_utils/Cargo.toml new file mode 100644 index 000000000..9aa85d1b9 --- /dev/null +++ b/crates/core/test_utils/Cargo.toml @@ -0,0 +1,20 @@ +[package] +name = "binius_core_test_utils" +version.workspace = true +edition.workspace = true +authors.workspace = true + +[lints] +workspace = true + +[dependencies] +binius_compute = { path = "../../compute", default-features = false } +binius_core = { path = "../../core", default-features = false } +binius_field = { path = "../../field", default-features = false } +binius_hal = { path = "../../hal", default-features = false } +binius_hash = { path = "../../hash", default-features = false } +binius_math = { path = "../../math", default-features = false } +binius_ntt = { path = "../../ntt", default-features = false } +binius_utils = { path = "../../utils", default-features = false } +bytemuck = { workspace = true, features = ["extern_crate_alloc"] } +rand = { workspace = true, features = ["std"] } diff --git a/crates/compute/test_utils/src/bivariate_sumcheck.rs b/crates/core/test_utils/src/bivariate_sumcheck.rs similarity index 100% rename from crates/compute/test_utils/src/bivariate_sumcheck.rs rename to crates/core/test_utils/src/bivariate_sumcheck.rs diff --git a/crates/core/test_utils/src/lib.rs b/crates/core/test_utils/src/lib.rs new file mode 100644 index 000000000..8840b6c0a --- /dev/null +++ b/crates/core/test_utils/src/lib.rs @@ -0,0 +1,5 @@ +// Copyright 2025 Irreducible Inc. + +pub mod bivariate_sumcheck; +pub mod piop; +pub mod ring_switch; diff --git a/crates/compute/test_utils/src/piop.rs b/crates/core/test_utils/src/piop.rs similarity index 100% rename from crates/compute/test_utils/src/piop.rs rename to crates/core/test_utils/src/piop.rs diff --git a/crates/compute/test_utils/src/ring_switch.rs b/crates/core/test_utils/src/ring_switch.rs similarity index 100% rename from crates/compute/test_utils/src/ring_switch.rs rename to crates/core/test_utils/src/ring_switch.rs diff --git a/crates/core/tests/piop.rs b/crates/core/tests/piop.rs index 3860de4a9..9d5e370d4 100644 --- a/crates/core/tests/piop.rs +++ b/crates/core/tests/piop.rs @@ -1,8 +1,8 @@ // Copyright 2025 Irreducible Inc. use binius_compute::cpu::layer::CpuLayerHolder; -use binius_compute_test_utils::piop::commit_prove_verify; use binius_core::{merkle_tree::BinaryMerkleTreeProver, piop::CommitMeta}; +use binius_core_test_utils::piop::commit_prove_verify; use binius_field::PackedBinaryField2x128b; use binius_hash::groestl::{Groestl256, Groestl256ByteCompression}; use binius_math::{B8, B16, B128}; diff --git a/crates/core/tests/ring_switch.rs b/crates/core/tests/ring_switch.rs index 94af31326..103e556ec 100644 --- a/crates/core/tests/ring_switch.rs +++ b/crates/core/tests/ring_switch.rs @@ -4,10 +4,6 @@ use binius_compute::{ ComputeData, ComputeHolder, cpu::{CpuLayer, layer::CpuLayerHolder}, }; -use binius_compute_test_utils::ring_switch::{ - check_eval_point_consistency, commit_prove_verify_piop, generate_multilinears, - make_test_oracle_set, setup_test_eval_claims, -}; use binius_core::{ fiat_shamir::HasherChallenger, merkle_tree::BinaryMerkleTreeProver, @@ -18,6 +14,10 @@ use binius_core::{ transcript::ProverTranscript, witness::MultilinearWitness, }; +use binius_core_test_utils::ring_switch::{ + check_eval_point_consistency, commit_prove_verify_piop, generate_multilinears, + make_test_oracle_set, setup_test_eval_claims, +}; use binius_field::{ arch::OptimalUnderlier128b, as_packed_field::{PackScalar, PackedType},