From 07fd3a65852997adf5968f927be0874198fbfb6e Mon Sep 17 00:00:00 2001 From: Evgeniy Zdanovich Date: Tue, 24 Dec 2024 19:46:39 +0100 Subject: [PATCH] Disable executing full sp1 prover tests that was previously enabled by mistake. --- crates/zkvm/hosts/Cargo.toml | 1 + provers/tests/Cargo.toml | 1 + provers/tests/src/btc.rs | 4 ++-- provers/tests/src/checkpoint.rs | 4 ++-- provers/tests/src/cl.rs | 4 ++-- provers/tests/src/el.rs | 4 ++-- provers/tests/src/l1_batch.rs | 4 ++-- provers/tests/src/l2_batch.rs | 4 ++-- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/crates/zkvm/hosts/Cargo.toml b/crates/zkvm/hosts/Cargo.toml index 5c0e82ed5..063fe6024 100644 --- a/crates/zkvm/hosts/Cargo.toml +++ b/crates/zkvm/hosts/Cargo.toml @@ -30,6 +30,7 @@ serde.workspace = true thiserror.workspace = true [features] +default = [] native = ["strata-native-zkvm-adapter"] risc0 = ["strata-risc0-adapter/prover", "strata-risc0-guest-builder/prover"] sp1 = ["strata-sp1-adapter/prover", "strata-sp1-guest-builder/prover"] diff --git a/provers/tests/Cargo.toml b/provers/tests/Cargo.toml index 9d5b07989..2de9c8c69 100644 --- a/provers/tests/Cargo.toml +++ b/provers/tests/Cargo.toml @@ -61,3 +61,4 @@ sp1 = [ "strata-sp1-guest-builder", "strata-zkvm-hosts/sp1", ] +test = [] diff --git a/provers/tests/src/btc.rs b/provers/tests/src/btc.rs index dfea59df3..99b549c3c 100644 --- a/provers/tests/src/btc.rs +++ b/provers/tests/src/btc.rs @@ -60,13 +60,13 @@ mod tests { } #[test] - #[cfg(feature = "risc0")] + #[cfg(all(feature = "risc0", feature = "test"))] fn test_risc0() { test_proof(crate::TEST_RISC0_GENERATORS.btc_blockspace()); } #[test] - #[cfg(feature = "sp1")] + #[cfg(all(feature = "sp1", feature = "test"))] fn test_sp1() { test_proof(crate::TEST_SP1_GENERATORS.btc_blockspace()); } diff --git a/provers/tests/src/checkpoint.rs b/provers/tests/src/checkpoint.rs index b2f4675e7..482368eaf 100644 --- a/provers/tests/src/checkpoint.rs +++ b/provers/tests/src/checkpoint.rs @@ -112,13 +112,13 @@ mod tests { } #[test] - #[cfg(feature = "risc0")] + #[cfg(all(feature = "risc0", feature = "test"))] fn test_risc0() { test_proof(crate::TEST_RISC0_GENERATORS.checkpoint()); } #[test] - #[cfg(feature = "sp1")] + #[cfg(all(feature = "sp1", feature = "test"))] fn test_sp1() { test_proof(crate::TEST_SP1_GENERATORS.checkpoint()); } diff --git a/provers/tests/src/cl.rs b/provers/tests/src/cl.rs index 82096bf2d..2b7f0c319 100644 --- a/provers/tests/src/cl.rs +++ b/provers/tests/src/cl.rs @@ -71,13 +71,13 @@ mod tests { } #[test] - #[cfg(feature = "risc0")] + #[cfg(all(feature = "risc0", feature = "test"))] fn test_risc0() { test_proof(crate::TEST_RISC0_GENERATORS.cl_block()); } #[test] - #[cfg(feature = "sp1")] + #[cfg(all(feature = "sp1", feature = "test"))] fn test_sp1() { test_proof(crate::TEST_SP1_GENERATORS.cl_block()); } diff --git a/provers/tests/src/el.rs b/provers/tests/src/el.rs index f51c03d2c..08b1a264e 100644 --- a/provers/tests/src/el.rs +++ b/provers/tests/src/el.rs @@ -53,13 +53,13 @@ mod tests { } #[test] - #[cfg(feature = "risc0")] + #[cfg(all(feature = "risc0", feature = "test"))] fn test_risc0() { test_proof(crate::TEST_RISC0_GENERATORS.el_block()); } #[test] - #[cfg(feature = "sp1")] + #[cfg(all(feature = "sp1", feature = "test"))] fn test_sp1() { test_proof(crate::TEST_SP1_GENERATORS.el_block()); } diff --git a/provers/tests/src/l1_batch.rs b/provers/tests/src/l1_batch.rs index d09ea8307..beef53e5e 100644 --- a/provers/tests/src/l1_batch.rs +++ b/provers/tests/src/l1_batch.rs @@ -82,13 +82,13 @@ mod tests { } #[test] - #[cfg(feature = "risc0")] + #[cfg(all(feature = "risc0", feature = "test"))] fn test_risc0() { test_proof(crate::TEST_RISC0_GENERATORS.l1_batch()); } #[test] - #[cfg(feature = "sp1")] + #[cfg(all(feature = "sp1", feature = "test"))] fn test_sp1() { test_proof(crate::TEST_SP1_GENERATORS.l1_batch()); } diff --git a/provers/tests/src/l2_batch.rs b/provers/tests/src/l2_batch.rs index 7ee019673..39705aaa8 100644 --- a/provers/tests/src/l2_batch.rs +++ b/provers/tests/src/l2_batch.rs @@ -61,13 +61,13 @@ mod tests { } #[test] - #[cfg(feature = "risc0")] + #[cfg(all(feature = "risc0", feature = "test"))] fn test_risc0() { test_proof(crate::TEST_RISC0_GENERATORS.l2_batch()); } #[test] - #[cfg(feature = "sp1")] + #[cfg(all(feature = "sp1", feature = "test"))] fn test_sp1() { test_proof(crate::TEST_SP1_GENERATORS.l2_batch()); }