From 2d1440ad8907a1d2c60c67ab25e82e52093bbc8a Mon Sep 17 00:00:00 2001 From: mattstam Date: Mon, 9 Dec 2024 18:04:45 -0800 Subject: [PATCH] remove feature gating --- crates/sdk/src/action.rs | 11 ----------- crates/sdk/src/provers/mod.rs | 3 --- 2 files changed, 14 deletions(-) diff --git a/crates/sdk/src/action.rs b/crates/sdk/src/action.rs index b767457ee..18391c1c9 100644 --- a/crates/sdk/src/action.rs +++ b/crates/sdk/src/action.rs @@ -91,9 +91,7 @@ pub struct Prove<'a> { core_opts: SP1CoreOpts, recursion_opts: SP1CoreOpts, timeout: Option, - #[cfg(feature = "network-v2")] fulfillment_strategy: Option, - #[cfg(feature = "network-v2")] skip_simulation: bool, } @@ -116,9 +114,7 @@ impl<'a> Prove<'a> { core_opts: SP1CoreOpts::default(), recursion_opts: SP1CoreOpts::recursion(), timeout: None, - #[cfg(feature = "network-v2")] fulfillment_strategy: None, - #[cfg(feature = "network-v2")] skip_simulation: false, } } @@ -134,20 +130,15 @@ impl<'a> Prove<'a> { core_opts, recursion_opts, timeout, - #[cfg(feature = "network-v2")] fulfillment_strategy, - #[cfg(feature = "network-v2")] skip_simulation, } = self; let opts = SP1ProverOpts { core_opts, recursion_opts }; let proof_opts = ProofOpts { sp1_prover_opts: opts, timeout, - #[cfg(feature = "network-v2")] fulfillment_strategy, - #[cfg(feature = "network-v2")] cycle_limit: context_builder.get_max_cycles(), - #[cfg(feature = "network-v2")] skip_simulation, }; let context = context_builder.build(); @@ -268,7 +259,6 @@ impl<'a> Prove<'a> { /// Sets the fulfillment strategy for the proof's generation. /// /// See `FulfillmentStrategy` for more details about each strategy. - #[cfg(feature = "network-v2")] pub fn strategy(mut self, strategy: FulfillmentStrategy) -> Self { self.fulfillment_strategy = Some(strategy); self @@ -282,7 +272,6 @@ impl<'a> Prove<'a> { /// When simulation is disabled: /// - If a cycle limit was set via `cycle_limit()`, that value will be used /// - Otherwise, the default cycle limit will be used - #[cfg(feature = "network-v2")] pub fn skip_simulation(mut self) -> Self { self.skip_simulation = true; self diff --git a/crates/sdk/src/provers/mod.rs b/crates/sdk/src/provers/mod.rs index 985fca23e..79c536e28 100644 --- a/crates/sdk/src/provers/mod.rs +++ b/crates/sdk/src/provers/mod.rs @@ -47,13 +47,10 @@ pub struct ProofOpts { /// Optional timeout duration for proof generation. pub timeout: Option, /// Optional fulfillment strategy for proof generation. Only used for network proofs. - #[cfg(feature = "network-v2")] pub fulfillment_strategy: Option, /// Optional cycle limit for proof generation. Only used for network proofs. - #[cfg(feature = "network-v2")] pub cycle_limit: Option, /// Whether to skip simulation for proof generation. Only used for network proofs. - #[cfg(feature = "network-v2")] pub skip_simulation: bool, }