Skip to content

Commit

Permalink
fix: Fix recursion tests and reinstate in CI (#5300)
Browse files Browse the repository at this point in the history
Reinstate honk recursion tests and fix the ones that were breaking.
(Breakage was simply due to an attempt to extract a builder from a
field_t that had not been properly initialized with a builder. Wasn't
caught because tests were off).

---------

Co-authored-by: codygunton <[email protected]>
  • Loading branch information
ledwards2225 and codygunton authored Mar 19, 2024
1 parent a216759 commit 96c6f21
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
20 changes: 17 additions & 3 deletions .circleci/config.yml
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
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

0 comments on commit 96c6f21

Please sign in to comment.