Consolidate spartan-wrapper crates into wrapper submodules (#1439)

## Summary
- Move `spartan-wrapper` into `spartan-verifier::wrapper` and
`spartan-wrapper-prover` into `spartan-prover::wrapper`
- Wire up re-exports from the new submodule locations and delete the old
standalone crates
- Update all imports and doc links to reference the new paths

## Test plan
- `cargo test -p binius-spartan-prover -p binius-spartan-verifier`
- `cargo clippy --all --all-features --tests --benches --examples -- -D
warnings`
- `cargo doc --no-deps --document-private-items`

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Author: jimpo

crates/spartan-prover/Cargo.toml

@@ -11,6 +11,7 @@ workspace = true
 binius-field = { path = "../field" }
 binius-iop = { path = "../iop" }
 binius-iop-prover = { path = "../iop-prover" }
+binius-ip = { path = "../ip" }
 binius-ip-prover = { path = "../ip-prover" }
 binius-math = { path = "../math" }
 binius-transcript = { path = "../transcript" }
@@ -29,7 +30,11 @@ tracing.workspace = true
 [dev-dependencies]
 anyhow.workspace = true
 binius-hash = { path = "../hash" }
+binius-iop = { path = "../iop" }
+binius-ip = { path = "../ip" }
 binius-math = { path = "../math", features = ["test-utils"] }
+binius-spartan-verifier = { path = "../spartan-verifier" }
+binius-verifier = { path = "../verifier" }
 rand = { workspace = true, features = ["thread_rng"] }
 smallvec.workspace = true
 

crates/spartan-prover/src/lib.rs

@@ -29,6 +29,7 @@
 
 mod error;
 mod wiring;
+pub mod wrapper;
 
 use std::{
 	iter::{repeat_n, repeat_with},

crates/spartan-wrapper-prover/src/lib.rs crates/spartan-prover/src/wrapper/mod.rscrates/spartan-wrapper-prover/src/lib.rs renamed to crates/spartan-prover/src/wrapper/mod.rs

@@ -8,9 +8,9 @@
 //! interaction through a [`ReplayChannel`] to fill the outer witness, then runs the outer IOP
 //! prover.
 //!
-//! [`ZKWrappedVerifierChannel`]: binius_spartan_wrapper::ZKWrappedVerifierChannel
+//! [`ZKWrappedVerifierChannel`]: binius_spartan_verifier::wrapper::ZKWrappedVerifierChannel
 //! [`BaseFoldZKProverChannel`]: binius_iop_prover::basefold_zk_channel::BaseFoldZKProverChannel
-//! [`ReplayChannel`]: binius_spartan_wrapper::ReplayChannel
+//! [`ReplayChannel`]: binius_spartan_verifier::wrapper::ReplayChannel
 //! [`finish`]: ZKWrappedProverChannel::finish
 
 mod zk_wrapped_prover_channel;

…-prover/src/zk_wrapped_prover_channel.rs …src/wrapper/zk_wrapped_prover_channel.rscrates/spartan-wrapper-prover/src/zk_wrapped_prover_channel.rs renamed to crates/spartan-prover/src/wrapper/zk_wrapped_prover_channel.rs crates/spartan-wrapper-prover/src/zk_wrapped_prover_channel.rs renamed to crates/spartan-prover/src/wrapper/zk_wrapped_prover_channel.rs

@@ -9,7 +9,7 @@
 //! a [`ReplayChannel`] to fill the outer witness, then runs the outer IOP prover.
 //!
 //! [`BaseFoldZKProverChannel`]: binius_iop_prover::basefold_zk_channel::BaseFoldZKProverChannel
-//! [`ReplayChannel`]: binius_spartan_wrapper::ReplayChannel
+//! [`ReplayChannel`]: binius_spartan_verifier::wrapper::ReplayChannel
 //! [`finish`]: ZKWrappedProverChannel::finish
 
 use binius_field::{BinaryField128bGhash as B128, PackedExtension, PackedField};
@@ -23,13 +23,13 @@ use binius_ip::channel::IPVerifierChannel;
 use binius_ip_prover::channel::IPProverChannel;
 use binius_math::{FieldBuffer, FieldSlice, ntt::AdditiveNTT};
 use binius_spartan_frontend::constraint_system::WitnessLayout;
-use binius_spartan_prover::IOPProver;
-use binius_spartan_verifier::IOPVerifier;
-use binius_spartan_wrapper::ReplayChannel;
+use binius_spartan_verifier::{IOPVerifier, wrapper::ReplayChannel};
 use binius_transcript::fiat_shamir::Challenger;
 use binius_utils::SerializeBytes;
 use rand::CryptoRng;
 
+use crate::IOPProver;
+
 /// A prover channel that wraps a [`BaseFoldZKProverChannel`] and an outer Spartan IOP prover.
 ///
 /// This channel records all channel values. On
@@ -108,8 +108,8 @@ where
 	/// 1. Replays the recorded interaction through a [`ReplayChannel`] to fill the outer witness
 	/// 2. Validates and generates the outer IOP proof
 	///
-	/// [`ReplayChannel`]: binius_spartan_wrapper::ReplayChannel
-	pub fn finish(self, rng: impl CryptoRng) -> Result<(), binius_spartan_prover::Error> {
+	/// [`ReplayChannel`]: binius_spartan_verifier::wrapper::ReplayChannel
+	pub fn finish(self, rng: impl CryptoRng) -> Result<(), crate::Error> {
 		let Self {
 			inner_channel,
 			outer_prover,

…wrapper-prover/tests/integration_test.rs …prover/tests/wrapper_integration_test.rscrates/spartan-wrapper-prover/tests/integration_test.rs renamed to crates/spartan-prover/tests/wrapper_integration_test.rs crates/spartan-wrapper-prover/tests/integration_test.rs renamed to crates/spartan-prover/tests/wrapper_integration_test.rs

@@ -17,12 +17,13 @@ use binius_spartan_frontend::{
 	compiler::compile,
 	constraint_system::BlindingInfo,
 };
-use binius_spartan_prover::IOPProver;
+use binius_spartan_prover::{IOPProver, wrapper::ZKWrappedProverChannel};
 use binius_spartan_verifier::{
-	IOPVerifier, SECURITY_BITS, config::StdChallenger, constraint_system::ConstraintSystemPadded,
+	IOPVerifier, SECURITY_BITS,
+	config::StdChallenger,
+	constraint_system::ConstraintSystemPadded,
+	wrapper::{IronSpartanBuilderChannel, ZKWrappedVerifierChannel},
 };
-use binius_spartan_wrapper::{IronSpartanBuilderChannel, ZKWrappedVerifierChannel};
-use binius_spartan_wrapper_prover::ZKWrappedProverChannel;
 use binius_transcript::ProverTranscript;
 use binius_verifier::fri::{self, MinProofSizeStrategy};
 use rand::{SeedableRng, rngs::StdRng};

crates/spartan-verifier/src/lib.rs

@@ -31,6 +31,7 @@
 pub mod config;
 pub mod constraint_system;
 pub mod wiring;
+pub mod wrapper;
 
 use binius_field::{BinaryField, BinaryField128bGhash as B128, field::FieldOps};
 use binius_iop::{

crates/spartan-wrapper/src/channel.rs …/spartan-verifier/src/wrapper/channel.rscrates/spartan-wrapper/src/channel.rs renamed to crates/spartan-verifier/src/wrapper/channel.rs crates/spartan-wrapper/src/channel.rs renamed to crates/spartan-verifier/src/wrapper/channel.rs

@@ -12,7 +12,7 @@ use binius_spartan_frontend::{
 	constraint_system::{ConstraintWire, WitnessLayout},
 };
 
-use crate::circuit_elem::{CircuitElem, CircuitWire};
+use super::circuit_elem::{CircuitElem, CircuitWire};
 
 /// A channel that symbolically executes a verifier, building up an IronSpartan constraint system.
 ///

…ates/spartan-wrapper/src/circuit_elem.rs …tan-verifier/src/wrapper/circuit_elem.rscrates/spartan-wrapper/src/circuit_elem.rs renamed to crates/spartan-verifier/src/wrapper/circuit_elem.rs crates/spartan-wrapper/src/circuit_elem.rs renamed to crates/spartan-verifier/src/wrapper/circuit_elem.rs

@@ -25,7 +25,7 @@ mod tests {
 	use binius_spartan_frontend::circuit_builder::ConstraintBuilder;
 
 	use super::*;
-	use crate::circuit_elem::{CircuitElem, CircuitWire};
+	use crate::wrapper::circuit_elem::{CircuitElem, CircuitWire};
 
 	type BuildElem = CircuitElem<ConstraintBuilder<B128>>;
 	type BuildWire = CircuitWire<ConstraintBuilder<B128>>;
@@ -145,7 +145,8 @@ mod tests {
 		use binius_spartan_frontend::{
 			circuit_builder::CircuitBuilder, circuits::powers, compiler::compile,
 		};
-		use binius_spartan_verifier::{
+
+		use crate::{
 			IOPVerifier,
 			constraint_system::{BlindingInfo, ConstraintSystemPadded},
 		};

crates/spartan-wrapper/src/lib.rs …ates/spartan-verifier/src/wrapper/mod.rscrates/spartan-wrapper/src/lib.rs renamed to crates/spartan-verifier/src/wrapper/mod.rs crates/spartan-wrapper/src/lib.rs renamed to crates/spartan-verifier/src/wrapper/mod.rs

@@ -15,10 +15,11 @@ use binius_iop::{
 	merkle_tree::MerkleTreeScheme,
 };
 use binius_ip::channel::IPVerifierChannel;
-use binius_spartan_verifier::IOPVerifier;
 use binius_transcript::fiat_shamir::Challenger;
 use binius_utils::DeserializeBytes;
 
+use crate::{Error, IOPVerifier};
+
 /// A verifier channel that wraps a [`BaseFoldZKVerifierChannel`] and an [`IOPVerifier`].
 ///
 /// All values received, sampled, and observed through this channel are recorded as public inputs
@@ -82,7 +83,7 @@ where
 	/// the required public size, and runs [`IOPVerifier::verify`] against the inner channel.
 	///
 	/// Returns the full public input vector on success.
-	pub fn finish(mut self) -> Result<Vec<B128>, binius_spartan_verifier::Error> {
+	pub fn finish(mut self) -> Result<Vec<B128>, Error> {
 		let outer_cs = self.outer_verifier.constraint_system();
 		let public_size = 1 << outer_cs.log_public();