Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pilcom proof fail test functions (reapprove) #2574

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions pipeline/src/test_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ pub fn assert_proofs_fail_for_invalid_witnesses_mock(
}

#[cfg(feature = "estark-starky")]
pub fn assert_proofs_fail_for_invalid_witnesses_pilcom(
pub fn assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic(
file_name: &str,
witness: &[(String, Vec<u64>)],
) {
Expand All @@ -522,6 +522,17 @@ pub fn assert_proofs_fail_for_invalid_witnesses_pilcom(
BackendVariant::Monolithic
)
.is_err());
}

#[cfg(feature = "estark-starky")]
pub fn assert_proofs_fail_for_invalid_witnesses_pilcom_composite(
file_name: &str,
witness: &[(String, Vec<u64>)],
) {
let pipeline = Pipeline::<GoldilocksField>::default()
.with_tmp_output()
.from_file(resolve_test_file(file_name));

assert!(run_pilcom_with_backend_variant(
pipeline
.with_backend_factory(powdr_backend::BackendType::EStarkDumpComposite)
Expand All @@ -532,7 +543,14 @@ pub fn assert_proofs_fail_for_invalid_witnesses_pilcom(
}

#[cfg(not(feature = "estark-starky"))]
pub fn assert_proofs_fail_for_invalid_witnesses_pilcom(
pub fn assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic(
_file_name: &str,
_witness: &[(String, Vec<u64>)],
) {
}

#[cfg(not(feature = "estark-starky"))]
pub fn assert_proofs_fail_for_invalid_witnesses_pilcom_composite(
_file_name: &str,
_witness: &[(String, Vec<u64>)],
) {
Expand Down Expand Up @@ -590,7 +608,8 @@ pub fn assert_proofs_fail_for_invalid_witnesses_halo2(

pub fn assert_proofs_fail_for_invalid_witnesses(file_name: &str, witness: &[(String, Vec<u64>)]) {
assert_proofs_fail_for_invalid_witnesses_mock(file_name, witness);
assert_proofs_fail_for_invalid_witnesses_pilcom(file_name, witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic(file_name, witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_composite(file_name, witness);
assert_proofs_fail_for_invalid_witnesses_estark(file_name, witness);
#[cfg(feature = "halo2")]
assert_proofs_fail_for_invalid_witnesses_halo2(file_name, witness);
Expand Down
15 changes: 10 additions & 5 deletions pipeline/tests/pil.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ use powdr_pipeline::{
test_util::{
assert_proofs_fail_for_invalid_witnesses, assert_proofs_fail_for_invalid_witnesses_estark,
assert_proofs_fail_for_invalid_witnesses_mock,
assert_proofs_fail_for_invalid_witnesses_pilcom,
assert_proofs_fail_for_invalid_witnesses_pilcom_composite,
assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic,
assert_proofs_fail_for_invalid_witnesses_stwo, make_prepared_pipeline,
make_simple_prepared_pipeline, regular_test_all_fields, regular_test_gl,
test_halo2_with_backend_variant, test_mock_backend, test_stwo, test_stwo_stage1_public,
Expand Down Expand Up @@ -44,7 +45,8 @@ fn lookup_with_selector() {
// Invalid witness: 0 is not in the set {2, 4}
let witness = vec![("main::w".to_string(), vec![0, 42, 4, 17])];
assert_proofs_fail_for_invalid_witnesses_mock(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_composite(f, &witness);
}

#[test]
Expand Down Expand Up @@ -84,7 +86,8 @@ fn permutation_with_selector() {
// Invalid witness: 0 is not in the set {2, 4}
let witness = vec![("main::w".to_string(), vec![0, 42, 4, 17])];
assert_proofs_fail_for_invalid_witnesses_mock(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_composite(f, &witness);
}

#[test]
Expand Down Expand Up @@ -130,7 +133,8 @@ fn fibonacci_invalid_witness() {
("Fibonacci::y".to_string(), vec![1, 2, 3, 13]),
];
assert_proofs_fail_for_invalid_witnesses_mock(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_composite(f, &witness);
assert_proofs_fail_for_invalid_witnesses_stwo(f, &witness);

// All constraints are valid, except the initial row.
Expand All @@ -141,7 +145,8 @@ fn fibonacci_invalid_witness() {
("Fibonacci::y".to_string(), vec![2, 3, 5, 8]),
];
assert_proofs_fail_for_invalid_witnesses_mock(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_monolithic(f, &witness);
assert_proofs_fail_for_invalid_witnesses_pilcom_composite(f, &witness);
assert_proofs_fail_for_invalid_witnesses_stwo(f, &witness);
}

Expand Down
Loading