refactor: Move honk/pcs (#3187)

As the second step to breaking apart honk/, I move honk/pcs/ to a new module commitment/schemes.
AztecProtocol · Nov 2, 2023 · 3870ff8 · 3870ff8
1 parent 4161be9
commit 3870ff8
Show file tree

Hide file tree

Showing 35 changed files with 41 additions and 38 deletions.
diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh
@@ -11,6 +11,7 @@ IMAGE_URI=$(calculate_image_uri $REPOSITORY)
 retry docker pull $IMAGE_URI
 
 TESTS=(
+  commitment_schemes_tests
   crypto_aes128_tests
   crypto_blake2s_tests
   crypto_blake3s_tests

diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt
@@ -49,6 +49,7 @@ else()
 endif()
 
 add_subdirectory(barretenberg/bb)
+add_subdirectory(barretenberg/commitment_schemes)
 add_subdirectory(barretenberg/common)
 add_subdirectory(barretenberg/crypto)
 add_subdirectory(barretenberg/dsl)

diff --git a/barretenberg/cpp/src/barretenberg/commitment_schemes/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/commitment_schemes/CMakeLists.txt
@@ -0,0 +1 @@
+barretenberg_module(commitment_schemes common transcript polynomials ecc numeric srs)
diff --git a/...g/cpp/src/barretenberg/honk/pcs/claim.hpp → ...barretenberg/commitment_schemes/claim.hpp b/...g/cpp/src/barretenberg/honk/pcs/claim.hpp → ...barretenberg/commitment_schemes/claim.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "barretenberg/honk/pcs/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
 namespace proof_system::honk::pcs {

diff --git a/.../barretenberg/honk/pcs/commitment_key.hpp → ...erg/commitment_schemes/commitment_key.hpp b/.../barretenberg/honk/pcs/commitment_key.hpp → ...erg/commitment_schemes/commitment_key.hpp
diff --git a/...etenberg/honk/pcs/commitment_key.test.hpp → ...ommitment_schemes/commitment_key.test.hpp b/...etenberg/honk/pcs/commitment_key.test.hpp → ...ommitment_schemes/commitment_key.test.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/verification_key.hpp"
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
-#include "barretenberg/honk/pcs/verification_key.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include "claim.hpp"

diff --git a/...c/barretenberg/honk/pcs/gemini/gemini.cpp → ...berg/commitment_schemes/gemini/gemini.cpp b/...c/barretenberg/honk/pcs/gemini/gemini.cpp → ...berg/commitment_schemes/gemini/gemini.cpp
diff --git a/...c/barretenberg/honk/pcs/gemini/gemini.hpp → ...berg/commitment_schemes/gemini/gemini.hpp b/...c/barretenberg/honk/pcs/gemini/gemini.hpp → ...berg/commitment_schemes/gemini/gemini.hpp
diff --git a/...retenberg/honk/pcs/gemini/gemini.test.cpp → ...commitment_schemes/gemini/gemini.test.cpp b/...retenberg/honk/pcs/gemini/gemini.test.cpp → ...commitment_schemes/gemini/gemini.test.cpp
diff --git a/...cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp → ...rretenberg/commitment_schemes/ipa/ipa.hpp b/...cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp → ...rretenberg/commitment_schemes/ipa/ipa.hpp
@@ -1,8 +1,8 @@
 #pragma once
+#include "barretenberg/commitment_schemes/claim.hpp"
+#include "barretenberg/commitment_schemes/verification_key.hpp"
 #include "barretenberg/common/assert.hpp"
 #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp"
-#include "barretenberg/honk/pcs/claim.hpp"
-#include "barretenberg/honk/pcs/verification_key.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 #include <cstddef>
 #include <numeric>

diff --git a/...rc/barretenberg/honk/pcs/ipa/ipa.test.cpp → ...nberg/commitment_schemes/ipa/ipa.test.cpp b/...rc/barretenberg/honk/pcs/ipa/ipa.test.cpp → ...nberg/commitment_schemes/ipa/ipa.test.cpp
@@ -1,10 +1,10 @@
 #include "ipa.hpp"
 #include "../gemini/gemini.hpp"
 #include "../shplonk/shplonk.hpp"
+#include "barretenberg/commitment_schemes/commitment_key.test.hpp"
 #include "barretenberg/common/mem.hpp"
 #include "barretenberg/ecc/curves/bn254/fq12.hpp"
 #include "barretenberg/ecc/curves/types.hpp"
-#include "barretenberg/honk/pcs/commitment_key.test.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 #include <gtest/gtest.h>

diff --git a/...cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp → ...rretenberg/commitment_schemes/kzg/kzg.hpp b/...cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp → ...rretenberg/commitment_schemes/kzg/kzg.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "../claim.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
-#include "barretenberg/honk/pcs/verification_key.hpp"
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/verification_key.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 

diff --git a/...rc/barretenberg/honk/pcs/kzg/kzg.test.cpp → ...nberg/commitment_schemes/kzg/kzg.test.cpp b/...rc/barretenberg/honk/pcs/kzg/kzg.test.cpp → ...nberg/commitment_schemes/kzg/kzg.test.cpp
@@ -4,7 +4,7 @@
 #include "../shplonk/shplonk.hpp"
 
 #include "../commitment_key.test.hpp"
-#include "barretenberg/honk/pcs/claim.hpp"
+#include "barretenberg/commitment_schemes/claim.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 
 #include "barretenberg/ecc/curves/bn254/g1.hpp"

diff --git a/...barretenberg/honk/pcs/shplonk/shplonk.hpp → ...rg/commitment_schemes/shplonk/shplonk.hpp b/...barretenberg/honk/pcs/shplonk/shplonk.hpp → ...rg/commitment_schemes/shplonk/shplonk.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "barretenberg/honk/pcs/claim.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
-#include "barretenberg/honk/pcs/verification_key.hpp"
+#include "barretenberg/commitment_schemes/claim.hpp"
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/verification_key.hpp"
 #include "barretenberg/transcript/transcript.hpp"
 
 /**

diff --git a/...tenberg/honk/pcs/shplonk/shplonk.test.cpp → ...mmitment_schemes/shplonk/shplonk.test.cpp b/...tenberg/honk/pcs/shplonk/shplonk.test.cpp → ...mmitment_schemes/shplonk/shplonk.test.cpp
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "../commitment_key.test.hpp"
-#include "barretenberg/honk/pcs/claim.hpp"
+#include "barretenberg/commitment_schemes/claim.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 namespace proof_system::honk::pcs::shplonk {
 template <class Params> class ShplonkTest : public CommitmentTest<Params> {};

diff --git a/...arretenberg/honk/pcs/verification_key.hpp → ...g/commitment_schemes/verification_key.hpp b/...arretenberg/honk/pcs/verification_key.hpp → ...g/commitment_schemes/verification_key.hpp
@@ -5,11 +5,11 @@
  *
  */
 
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/ecc/curves/bn254/pairing.hpp"
 #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
 #include "barretenberg/numeric/bitop/pow.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"

diff --git a/...cpp/src/barretenberg/honk/pcs/wrapper.hpp → ...rretenberg/commitment_schemes/wrapper.hpp b/...cpp/src/barretenberg/honk/pcs/wrapper.hpp → ...rretenberg/commitment_schemes/wrapper.hpp
diff --git a/...etenberg/honk/pcs/zeromorph/zeromorph.hpp → ...ommitment_schemes/zeromorph/zeromorph.hpp b/...etenberg/honk/pcs/zeromorph/zeromorph.hpp → ...ommitment_schemes/zeromorph/zeromorph.hpp
diff --git a/...erg/honk/pcs/zeromorph/zeromorph.test.cpp → ...ment_schemes/zeromorph/zeromorph.test.cpp b/...erg/honk/pcs/zeromorph/zeromorph.test.cpp → ...ment_schemes/zeromorph/zeromorph.test.cpp
diff --git a/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt
@@ -1,4 +1,4 @@
-barretenberg_module(honk numeric ecc srs proof_system transcript)
+barretenberg_module(honk numeric ecc srs proof_system transcript commitment_schemes)
 
 if(TESTING)
     # TODO: Re-enable all these warnings once PoC is finished

diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp
@@ -1,10 +1,10 @@
 #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/honk/pcs/commitment_key.hpp"
-#include "barretenberg/honk/pcs/ipa/ipa.hpp"
-#include "barretenberg/honk/pcs/kzg/kzg.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_translator.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_translator.hpp
@@ -1,8 +1,8 @@
 #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/honk/pcs/commitment_key.hpp"
-#include "barretenberg/honk/pcs/kzg/kzg.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/arithmetization/arithmetization.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "barretenberg/honk/pcs/kzg/kzg.hpp"
+#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp
@@ -1,7 +1,7 @@
 #pragma once
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
-#include "barretenberg/honk/pcs/kzg/kzg.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 

diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
@@ -1,6 +1,6 @@
 #pragma once
+#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/honk/pcs/kzg/kzg.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
@@ -1,7 +1,7 @@
 #pragma once
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/kzg/kzg.hpp"
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
-#include "barretenberg/honk/pcs/kzg/kzg.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp
@@ -1,6 +1,6 @@
 #include "eccvm_prover.hpp"
-#include "barretenberg/honk/pcs/claim.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/claim.hpp"
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/honk/proof_system/lookup_library.hpp"
 #include "barretenberg/honk/proof_system/permutation_library.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp b/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/honk/pcs/gemini/gemini.hpp"
-#include "barretenberg/honk/pcs/shplonk/shplonk.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.cpp
@@ -1,6 +1,6 @@
 #include "./eccvm_verifier.hpp"
-#include "barretenberg/honk/pcs/gemini/gemini.hpp"
-#include "barretenberg/honk/pcs/shplonk/shplonk.hpp"
+#include "barretenberg/commitment_schemes/gemini/gemini.hpp"
+#include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
 #include "barretenberg/honk/utils/power_polynomial.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/transcript/transcript.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp b/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/honk/pcs/claim.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include "barretenberg/transcript/transcript.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp b/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/honk/pcs/claim.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp"
 #include "barretenberg/transcript/transcript.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
@@ -1,8 +1,8 @@
 #pragma once
+#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/honk/flavor/goblin_ultra.hpp"
 #include "barretenberg/honk/flavor/ultra.hpp"
 #include "barretenberg/honk/instance/prover_instance.hpp"
-#include "barretenberg/honk/pcs/zeromorph/zeromorph.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/proof_system/relations/relation_parameters.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp
@@ -1,5 +1,5 @@
 #include "./ultra_verifier.hpp"
-#include "barretenberg/honk/pcs/zeromorph/zeromorph.hpp"
+#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/honk/utils/power_polynomial.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/transcript/transcript.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
@@ -3,7 +3,7 @@
  * @brief Contains some functions that are shared between the various Plonk composers.
  */
 #include "composer_lib.hpp"
-#include "barretenberg/honk/pcs/commitment_key.hpp"
+#include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/srs/factories/crs_factory.hpp"
 
 namespace proof_system::plonk {

diff --git a/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
@@ -1,5 +1,5 @@
 #include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
-#include "barretenberg/honk/pcs/zeromorph/zeromorph.hpp"
+#include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/honk/utils/power_polynomial.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		barretenberg_module(commitment_schemes common transcript polynomials ecc numeric srs)