Skip to content

fix: Fix recursion tests and reinstate in CI #5300

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.

Sign up for GitHub

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

Merged
ledwards2225 merged 5 commits into from
Mar 19, 2024
Merged

fix: Fix recursion tests and reinstate in CI #5300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
842e15d
fix ZM issue; no builder on evaluation
ledwards2225 Mar 18, 2024
003a1ab
reinstate
ledwards2225 Mar 18, 2024
954c299
woops
ledwards2225 Mar 18, 2024
14882d6
fix comment
ledwards2225 Mar 18, 2024
274b51c
Merge remote-tracking branch 'origin/master' into lde/fix_and_reinsta…
codygunton Mar 19, 2024
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
20 changes: 17 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ jobs:
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 proof_system_tests
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-stdlib-recursion-ultra-tests:
barretenberg-stdlib-plonk-recursion-ultra-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
Expand All @@ -259,6 +259,18 @@ jobs:
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_plonk_recursion_tests --gtest_filter=-*turbo*
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-stdlib-honk-recursion-ultra-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_honk_recursion_tests
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

bb-js:
machine:
image: default
Expand Down Expand Up @@ -1304,7 +1316,8 @@ workflows:
- barretenberg-dsl-tests: *bb_test
- barretenberg-tests: *bb_test
- barretenberg-stdlib-tests: *bb_test
- barretenberg-stdlib-recursion-ultra-tests: *bb_test
- barretenberg-stdlib-plonk-recursion-ultra-tests: *bb_test
- barretenberg-stdlib-honk-recursion-ultra-tests: *bb_test
- barretenberg-acir-tests-bb: *bb_acir_tests
- barretenberg-acir-tests-bb-sol:
requires:
Expand Down Expand Up @@ -1443,7 +1456,8 @@ workflows:
- barretenberg-dsl-tests
- barretenberg-tests
- barretenberg-stdlib-tests
- barretenberg-stdlib-recursion-ultra-tests
- barretenberg-stdlib-plonk-recursion-ultra-tests
- barretenberg-stdlib-honk-recursion-ultra-tests
- barretenberg-acir-tests-bb
- barretenberg-acir-tests-bb-sol
- barretenberg-docs
Expand Down
10 changes: 9 additions & 1 deletion barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,8 +704,16 @@ template <typename PCS> class ZeroMorphVerifier_ {
C_zeta_Z = C_zeta_x + C_Z_x * z_challenge;
}

// Define the evaluation (always zero by construction in this case) for the PCS opening
FF evaluation{ 0 };
if constexpr (Curve::is_stdlib_type) { // add builder if in circuit context
auto builder = z_challenge.get_context();
evaluation = FF(builder, 0);
}

return PCS::reduce_verify(
{ .opening_pair = { .challenge = x_challenge, .evaluation = FF(0) }, .commitment = C_zeta_Z }, transcript);
{ .opening_pair = { .challenge = x_challenge, .evaluation = evaluation }, .commitment = C_zeta_Z },
transcript);
}
};

Expand Down