Exports needed for recursion (risc0#847)

csalvador58 · Sep 8, 2023 · 22a00ef · 22a00ef
1 parent ed5bf68
commit 22a00ef
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 41 deletions.
diff --git a/bonsai/examples/governance/Cargo.lock b/bonsai/examples/governance/Cargo.lock
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/risc0/zkvm/src/host/recursion/mod.rs b/risc0/zkvm/src/host/recursion/mod.rs
@@ -24,9 +24,12 @@ mod poly_ext;
 mod receipt;
 mod taps;
 
-pub use control_id::ALLOWED_IDS_ROOT;
-pub use poly_ext::DEF;
-pub use receipt::{valid_control_ids, SuccinctReceipt};
+pub use self::{
+    control_id::ALLOWED_IDS_ROOT,
+    poly_ext::DEF,
+    receipt::{valid_control_ids, SuccinctReceipt},
+    taps::TAPSET,
+};
 
 /// This struct implements traits that are defined by code generated by the
 /// circuit definition.

diff --git a/risc0/zkvm/src/lib.rs b/risc0/zkvm/src/lib.rs
@@ -25,6 +25,13 @@ mod host;
 pub mod serde;
 pub mod sha;
 
+/// Re-exports for recursion
+#[cfg(not(target_os = "zkvm"))]
+#[cfg(feature = "prove")]
+pub mod recursion {
+    pub use super::host::recursion::*;
+}
+
 pub use anyhow::Result;
 #[cfg(not(target_os = "zkvm"))]
 #[cfg(any(feature = "client", feature = "prove"))]
@@ -55,7 +62,7 @@ pub use self::host::{
     client::prove::local::LocalProver,
     server::{
         exec::executor::Executor,
-        prove::{get_prover_impl, loader::Loader, DynProverImpl},
+        prove::{get_prover_impl, loader::Loader, DynProverImpl, HalPair},
         session::{FileSegmentRef, Segment, SegmentRef, Session, SessionEvents, SimpleSegmentRef},
     },
 };