From 2fcedc55a283fa7b0024cb2e27f60be1f2a81ddd Mon Sep 17 00:00:00 2001 From: Bartosz Nowak Date: Sat, 20 Apr 2024 23:00:41 +0200 Subject: [PATCH] full_test switch --- .github/workflows/test.yaml | 20 +++++++++++-- crates/prover/Cargo.toml | 5 +++- crates/prover/src/stone_prover/tests/mod.rs | 2 +- .../prover/src/stone_prover/tests/models.rs | 27 +++++++++++------- crates/runner/Cargo.toml | 5 +++- crates/runner/src/cairo_runner/tests/mod.rs | 2 +- crates/tests/Cargo.toml | 5 +++- crates/tests/cairo/cpu_air_params.json | 28 ------------------- crates/tests/cairo/cpu_air_prover_config.json | 9 ------ crates/tests/src/tests/mod.rs | 1 + 10 files changed, 49 insertions(+), 55 deletions(-) delete mode 100644 crates/tests/cairo/cpu_air_params.json delete mode 100644 crates/tests/cairo/cpu_air_prover_config.json diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2ebc201..fe4edab 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -5,7 +5,7 @@ on: pull_request: jobs: - formatting-and-testing: + setup: runs-on: ubuntu-latest steps: - name: Checkout repository @@ -27,12 +27,26 @@ jobs: - name: Provision Environment run: python install.py - + - name: Format code run: cargo fmt --check + - name: Build + run: cargo build + + tests: + needs: setup + runs-on: ubuntu-latest + steps: - name: Run cargo tests run: cargo test - name: Run snforge tests - run: snforge test \ No newline at end of file + run: snforge test + + full_tests: + needs: setup + runs-on: ubuntu-latest + steps: + - name: Run cargo full_tests + run: cargo test --features full_test \ No newline at end of file diff --git a/crates/prover/Cargo.toml b/crates/prover/Cargo.toml index 023e4ad..477d4cb 100644 --- a/crates/prover/Cargo.toml +++ b/crates/prover/Cargo.toml @@ -19,4 +19,7 @@ strum.workspace = true tempfile.workspace = true thiserror.workspace = true tokio.workspace = true -tracing.workspace = true \ No newline at end of file +tracing.workspace = true + +[features] +full_test = [] \ No newline at end of file diff --git a/crates/prover/src/stone_prover/tests/mod.rs b/crates/prover/src/stone_prover/tests/mod.rs index 7c53e35..e829339 100644 --- a/crates/prover/src/stone_prover/tests/mod.rs +++ b/crates/prover/src/stone_prover/tests/mod.rs @@ -1,6 +1,6 @@ pub mod models; -#[cfg(test)] +#[cfg(all(test, feature = "full_test"))] pub mod multiple_job; #[cfg(test)] pub mod single_job; diff --git a/crates/prover/src/stone_prover/tests/models.rs b/crates/prover/src/stone_prover/tests/models.rs index 04acfdb..1764217 100644 --- a/crates/prover/src/stone_prover/tests/models.rs +++ b/crates/prover/src/stone_prover/tests/models.rs @@ -1,4 +1,7 @@ -use crate::stone_prover::types::{config::Config, params::Params}; +use crate::stone_prover::types::{ + config::Config, + params::{Fri, Params, Stark}, +}; use sharp_p2p_common::job_trace::JobTrace; use std::{env, fs, io::Write, path::PathBuf}; use tempfile::NamedTempFile; @@ -18,9 +21,6 @@ pub fn fixture() -> TestFixture { let memory_path = ws_root.join("crates/tests/cairo/memory"); let trace_path = ws_root.join("crates/tests/cairo/trace"); - let cpu_air_prover_config_path = ws_root.join("crates/tests/cairo/cpu_air_prover_config.json"); - let cpu_air_params_path = ws_root.join("crates/tests/cairo/cpu_air_params.json"); - let mut air_public_input = NamedTempFile::new().unwrap(); air_public_input.write_all(&fs::read(air_public_input_path).unwrap()).unwrap(); @@ -35,11 +35,18 @@ pub fn fixture() -> TestFixture { TestFixture { job_trace: JobTrace { air_public_input, air_private_input, memory, trace }, - cpu_air_prover_config: serde_json::from_str( - &fs::read_to_string(cpu_air_prover_config_path).unwrap(), - ) - .unwrap(), - cpu_air_params: serde_json::from_str(&fs::read_to_string(cpu_air_params_path).unwrap()) - .unwrap(), + cpu_air_prover_config: Config::default(), + cpu_air_params: Params { + stark: Stark { + fri: Fri { + fri_step_list: vec![0, 4, 4, 3], + last_layer_degree_bound: 128, + n_queries: 1, + proof_of_work_bits: 1, + }, + log_n_cosets: 1, + }, + ..Default::default() + }, } } diff --git a/crates/runner/Cargo.toml b/crates/runner/Cargo.toml index de2b6bb..42300f5 100644 --- a/crates/runner/Cargo.toml +++ b/crates/runner/Cargo.toml @@ -23,4 +23,7 @@ tempfile.workspace = true thiserror.workspace = true tokio.workspace = true tracing.workspace = true -zip-extensions.workspace = true \ No newline at end of file +zip-extensions.workspace = true + +[features] +full_test = [] \ No newline at end of file diff --git a/crates/runner/src/cairo_runner/tests/mod.rs b/crates/runner/src/cairo_runner/tests/mod.rs index 7c53e35..e829339 100644 --- a/crates/runner/src/cairo_runner/tests/mod.rs +++ b/crates/runner/src/cairo_runner/tests/mod.rs @@ -1,6 +1,6 @@ pub mod models; -#[cfg(test)] +#[cfg(all(test, feature = "full_test"))] pub mod multiple_job; #[cfg(test)] pub mod single_job; diff --git a/crates/tests/Cargo.toml b/crates/tests/Cargo.toml index d5922eb..9011b59 100644 --- a/crates/tests/Cargo.toml +++ b/crates/tests/Cargo.toml @@ -11,4 +11,7 @@ license-file.workspace = true futures.workspace = true sharp-p2p-prover.workspace = true sharp-p2p-runner.workspace = true -tokio.workspace = true \ No newline at end of file +tokio.workspace = true + +[features] +full_test = [] \ No newline at end of file diff --git a/crates/tests/cairo/cpu_air_params.json b/crates/tests/cairo/cpu_air_params.json deleted file mode 100644 index b82ab37..0000000 --- a/crates/tests/cairo/cpu_air_params.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "field": "PrimeField0", - "channel_hash": "poseidon3", - "commitment_hash": "keccak256_masked160_lsb", - "n_verifier_friendly_commitment_layers": 100, - "pow_hash": "keccak256", - "statement": { - "page_hash": "pedersen" - }, - "stark": { - "fri": { - "fri_step_list": [ - 0, - 4, - 4, - 3 - ], - "last_layer_degree_bound": 128, - "n_queries": 1, - "proof_of_work_bits": 1 - }, - "log_n_cosets": 1 - }, - - "use_extension_field": false, - "verifier_friendly_channel_updates": true, - "verifier_friendly_commitment_hash": "poseidon3" -} \ No newline at end of file diff --git a/crates/tests/cairo/cpu_air_prover_config.json b/crates/tests/cairo/cpu_air_prover_config.json deleted file mode 100644 index 1edccf2..0000000 --- a/crates/tests/cairo/cpu_air_prover_config.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "cached_lde_config": { - "store_full_lde": false, - "use_fft_for_eval": false - }, - "constraint_polynomial_task_size": 256, - "n_out_of_memory_merkle_layers": 0, - "table_prover_n_tasks_per_segment": 32 -} \ No newline at end of file diff --git a/crates/tests/src/tests/mod.rs b/crates/tests/src/tests/mod.rs index effc0d7..e84c1c8 100644 --- a/crates/tests/src/tests/mod.rs +++ b/crates/tests/src/tests/mod.rs @@ -1 +1,2 @@ +#[cfg(all(test, feature = "full_test"))] mod runner_prover_flow;