Skip to content

Commit

Permalink
remove feature gating
Browse files Browse the repository at this point in the history
  • Loading branch information
mattstam committed Dec 10, 2024
1 parent 8874706 commit 2d1440a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
11 changes: 0 additions & 11 deletions crates/sdk/src/action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ pub struct Prove<'a> {
core_opts: SP1CoreOpts,
recursion_opts: SP1CoreOpts,
timeout: Option<Duration>,
#[cfg(feature = "network-v2")]
fulfillment_strategy: Option<FulfillmentStrategy>,
#[cfg(feature = "network-v2")]
skip_simulation: bool,
}

Expand All @@ -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,
}
}
Expand All @@ -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();
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions crates/sdk/src/provers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,10 @@ pub struct ProofOpts {
/// Optional timeout duration for proof generation.
pub timeout: Option<Duration>,
/// Optional fulfillment strategy for proof generation. Only used for network proofs.
#[cfg(feature = "network-v2")]
pub fulfillment_strategy: Option<FulfillmentStrategy>,
/// Optional cycle limit for proof generation. Only used for network proofs.
#[cfg(feature = "network-v2")]
pub cycle_limit: Option<u64>,
/// Whether to skip simulation for proof generation. Only used for network proofs.
#[cfg(feature = "network-v2")]
pub skip_simulation: bool,
}

Expand Down

0 comments on commit 2d1440a

Please sign in to comment.