From a8895d07595ec8988b11fe9600e4b3a8cedd05b6 Mon Sep 17 00:00:00 2001
From: Daniel Kales <11509575+dkales@users.noreply.github.com>
Date: Tue, 24 Feb 2026 17:49:14 +0100
Subject: [PATCH] refactor: make WhirR1CSVerifier and WhirR1CSProver traits and
 related types part of the public API

This enables users to potentially plug in other R1CS frontends than Noir.
---
 provekit/prover/src/lib.rs   | 7 +++----
 provekit/verifier/src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/provekit/prover/src/lib.rs b/provekit/prover/src/lib.rs
index 85586ac1f..ad582a4d1 100644
--- a/provekit/prover/src/lib.rs
+++ b/provekit/prover/src/lib.rs
@@ -1,10 +1,7 @@
 #[cfg(test)]
 use crate::r1cs::R1CSSolver;
 use {
-    crate::{
-        r1cs::{CompressedLayers, CompressedR1CS},
-        whir_r1cs::WhirR1CSProver,
-    },
+    crate::r1cs::{CompressedLayers, CompressedR1CS},
     acir::native_types::WitnessMap,
     anyhow::{Context, Result},
     bn254_blackbox_solver::Bn254BlackBoxSolver,
@@ -26,6 +23,8 @@ mod r1cs;
 mod whir_r1cs;
 mod witness;
 
+pub use whir_r1cs::{BlindingState, WhirR1CSCommitment, WhirR1CSProver};
+
 pub trait Prove {
     fn prove(self, prover_toml: impl AsRef<Path>) -> Result<NoirProof>;
 }
diff --git a/provekit/verifier/src/lib.rs b/provekit/verifier/src/lib.rs
index 328ef141d..d4523b311 100644
--- a/provekit/verifier/src/lib.rs
+++ b/provekit/verifier/src/lib.rs
@@ -1,7 +1,7 @@
 mod whir_r1cs;
 
+pub use whir_r1cs::WhirR1CSVerifier;
 use {
-    crate::whir_r1cs::WhirR1CSVerifier,
     anyhow::{Context, Result},
     provekit_common::{NoirProof, Verifier},
     tracing::instrument,