refactor: Move flavors (#3188)

Part three of my breaking-up of honk/ moves all of the flavors to their
own modules.This will enable modules that only use flavor information to
rely on a module much smaller than honk. In particular, this will enable
moving honk/sumcheck to its own module.

barretenberg/cpp/scripts/bb-tests.sh

@@ -21,6 +21,7 @@ TESTS=(
   crypto_pedersen_commitment_tests
   crypto_pedersen_hash_tests
   ecc_tests
+  flavor_tests
   numeric_tests
   plonk_tests
   polynomials_tests

barretenberg/cpp/src/CMakeLists.txt

@@ -56,6 +56,7 @@ add_subdirectory(barretenberg/dsl)
 add_subdirectory(barretenberg/ecc)
 add_subdirectory(barretenberg/env)
 add_subdirectory(barretenberg/examples)
+add_subdirectory(barretenberg/flavor)
 add_subdirectory(barretenberg/grumpkin_srs_gen)
 add_subdirectory(barretenberg/honk)
 add_subdirectory(barretenberg/join_split_example)

barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp

@@ -1,5 +1,5 @@
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"

barretenberg/cpp/src/barretenberg/benchmark/relations_bench/widget.bench.cpp

@@ -1,6 +1,6 @@
 #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp"
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/plonk/composer/standard_composer.hpp"
 #include "barretenberg/plonk/composer/ultra_composer.hpp"
 #include "barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp"

barretenberg/cpp/src/barretenberg/flavor/CMakeLists.txt

@@ -0,0 +1 @@
+barretenberg_module(flavor commitment_schemes ecc polynomials proof_system)

barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp → barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp

@@ -1,12 +1,11 @@
 #pragma once
-#include "../sumcheck/relation_definitions_fwd.hpp"
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/commitment_schemes/ipa/ipa.hpp"
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.hpp"
@@ -15,6 +14,7 @@
 #include "barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/proof_system/relations/relation_types.hpp"
+#include "relation_definitions_fwd.hpp"
 #include <array>
 #include <concepts>
 #include <span>

barretenberg/cpp/src/barretenberg/flavor/flavor.cpp

@@ -0,0 +1,3 @@
+#include "flavor.hpp"
+
+// This file is here to make sure that a flavor object file is created.

barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp → barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/srs/factories/crs_factory.hpp"
 #include <cstddef>

barretenberg/cpp/src/barretenberg/honk/flavor/goblin_translator.hpp → barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp

@@ -1,17 +1,17 @@
 #pragma once
-#include "../sumcheck/relation_definitions_fwd.hpp"
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/arithmetization/arithmetization.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/translator_vm/translator_decomposition_relation.hpp"
 #include "barretenberg/proof_system/relations/translator_vm/translator_extra_relations.hpp"
 #include "barretenberg/proof_system/relations/translator_vm/translator_gen_perm_sort_relation.hpp"
 #include "barretenberg/proof_system/relations/translator_vm/translator_non_native_field_relation.hpp"
 #include "barretenberg/proof_system/relations/translator_vm/translator_permutation_relation.hpp"
+#include "relation_definitions_fwd.hpp"
 #include <array>
 #include <concepts>
 #include <span>

barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp → barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp

@@ -1,8 +1,8 @@
 #pragma once
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"

barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp → barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp

@@ -5,11 +5,11 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"

barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp → barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp

@@ -1,9 +1,9 @@
 #pragma once
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/plonk/transcript/transcript.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 
 namespace proof_system::plonk::flavor {
 class Standard {

barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp → barretenberg/cpp/src/barretenberg/flavor/ultra.hpp

@@ -1,12 +1,12 @@
 #pragma once
 #include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"

barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp → barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp

@@ -5,11 +5,11 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"

barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt

@@ -1,4 +1,4 @@
-barretenberg_module(honk numeric ecc srs proof_system transcript commitment_schemes)
+barretenberg_module(honk numeric ecc srs proof_system transcript commitment_schemes flavor)
 
 if(TESTING)
     # TODO: Re-enable all these warnings once PoC is finished

barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp

@@ -1,8 +1,8 @@
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/honk/composer/eccvm_composer.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 #include <gtest/gtest.h>
 

barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp

@@ -1,8 +1,8 @@
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 #include <gtest/gtest.h>
 

barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/honk/instance/prover_instance.hpp"
 #include "barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp"
 #include "barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp"
@@ -7,7 +8,6 @@
 #include "barretenberg/honk/proof_system/ultra_prover.hpp"
 #include "barretenberg/honk/proof_system/ultra_verifier.hpp"
 #include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/srs/global_crs.hpp"
 
 namespace proof_system::honk {

barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp

@@ -1,8 +1,8 @@
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 #include <gtest/gtest.h>
 

barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.hpp

@@ -1,9 +1,9 @@
 #pragma once
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/proof_system/folding_result.hpp"
 #include "barretenberg/proof_system/composer/composer_lib.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 namespace proof_system::honk {

barretenberg/cpp/src/barretenberg/honk/instance/verifier_instance.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "barretenberg/proof_system/flavor/flavor.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"
 namespace proof_system::honk {
 template <class Flavor> class VerifierInstance_ {

barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/instance/instances.hpp"
 #include "barretenberg/honk/proof_system/protogalaxy_prover.hpp"
 #include "barretenberg/honk/utils/testing.hpp"

barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/commitment_schemes/gemini/gemini.hpp"
 #include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
-#include "barretenberg/honk/flavor/ecc_vm.hpp"
+#include "barretenberg/flavor/ecc_vm.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"

barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "barretenberg/honk/flavor/ecc_vm.hpp"
+#include "barretenberg/flavor/ecc_vm.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 

barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "barretenberg/proof_system/flavor/flavor.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"
 namespace proof_system::honk {
 template <class Flavor> struct ProverFoldingResult {

barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "barretenberg/commitment_schemes/claim.hpp"
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include "barretenberg/transcript/transcript.hpp"

barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "barretenberg/commitment_schemes/claim.hpp"
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include "barretenberg/transcript/transcript.hpp"

barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.test.cpp

@@ -1,7 +1,7 @@
 
 #include "grand_product_library.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
 #include "barretenberg/srs/factories/file_crs_factory.hpp"

barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.cpp

@@ -1,5 +1,5 @@
 #include "protogalaxy_prover.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 namespace proof_system::honk {
 
 template <class ProverInstances> void ProtoGalaxyProver_<ProverInstances>::prepare_for_folding()

barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp

@@ -1,13 +1,13 @@
 #pragma once
 #include "barretenberg/common/thread.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/instance/instances.hpp"
 #include "barretenberg/honk/proof_system/folding_result.hpp"
 #include "barretenberg/polynomials/pow.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/proof_system/relations/utils.hpp"
 

barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp

@@ -1,9 +1,9 @@
 #pragma once
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/flavor.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/instance/instances.hpp"
 #include "barretenberg/honk/proof_system/folding_result.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
 namespace proof_system::honk {

barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/instance/prover_instance.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"

barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/goblin_ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 

barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp

@@ -1,4 +1,4 @@
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck.hpp"
 #include <gtest/gtest.h>
 

barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp

@@ -1,5 +1,5 @@
+#include "barretenberg/flavor/goblin_translator.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
-#include "barretenberg/honk/flavor/goblin_translator.hpp"
 #include "barretenberg/honk/proof_system/grand_product_library.hpp"
 #include "barretenberg/honk/proof_system/permutation_library.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"

barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp

@@ -2,9 +2,9 @@
 #include "barretenberg/common/log.hpp"
 #include "barretenberg/common/thread.hpp"
 #include "barretenberg/common/thread_utils.hpp"
+#include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/pow.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/proof_system/relations/relation_types.hpp"
 #include "barretenberg/proof_system/relations/utils.hpp"

barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp

@@ -1,5 +1,5 @@
 #include "sumcheck_round.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include "barretenberg/proof_system/relations/utils.hpp"
 
 #include <gtest/gtest.h>

barretenberg/cpp/src/barretenberg/honk/utils/testing.test.cpp

@@ -1,5 +1,5 @@
 #include "testing.hpp"
-#include "barretenberg/honk/flavor/ultra.hpp"
+#include "barretenberg/flavor/ultra.hpp"
 #include <gtest/gtest.h>
 
 namespace barretenberg::test_testing_utils {

barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt

@@ -1 +1 @@
-barretenberg_module(plonk proof_system transcript crypto_pedersen_commitment polynomials crypto_sha256 ecc crypto_blake3s srs)
+barretenberg_module(plonk proof_system transcript crypto_pedersen_commitment polynomials crypto_sha256 ecc crypto_blake3s srs flavor)

barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
+#include "barretenberg/flavor/plonk_flavors.hpp"
 #include "barretenberg/plonk/composer/composer_lib.hpp"
-#include "barretenberg/plonk/flavor/flavor.hpp"
 #include "barretenberg/plonk/proof_system/prover/prover.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"

barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
+#include "barretenberg/flavor/plonk_flavors.hpp"
 #include "barretenberg/plonk/composer/composer_lib.hpp"
-#include "barretenberg/plonk/flavor/flavor.hpp"
 #include "barretenberg/plonk/proof_system/prover/prover.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/plonk/proof_system/verifier/verifier.hpp"