From 86e3101d113b8f9b5d7ae7969062daaf2a210ed8 Mon Sep 17 00:00:00 2001 From: codygunton Date: Wed, 1 Nov 2023 21:13:39 +0000 Subject: [PATCH 1/2] Move honk/pcs/ to commitment_schemes/ --- barretenberg/cpp/src/CMakeLists.txt | 1 + .../cpp/src/barretenberg/commitment_schemes/CMakeLists.txt | 1 + .../barretenberg/{honk/pcs => commitment_schemes}/claim.hpp | 2 +- .../{honk/pcs => commitment_schemes}/commitment_key.hpp | 0 .../pcs => commitment_schemes}/commitment_key.test.hpp | 4 ++-- .../{honk/pcs => commitment_schemes}/gemini/gemini.cpp | 0 .../{honk/pcs => commitment_schemes}/gemini/gemini.hpp | 0 .../{honk/pcs => commitment_schemes}/gemini/gemini.test.cpp | 0 .../{honk/pcs => commitment_schemes}/ipa/ipa.hpp | 4 ++-- .../{honk/pcs => commitment_schemes}/ipa/ipa.test.cpp | 2 +- .../{honk/pcs => commitment_schemes}/kzg/kzg.hpp | 4 ++-- .../{honk/pcs => commitment_schemes}/kzg/kzg.test.cpp | 2 +- .../{honk/pcs => commitment_schemes}/shplonk/shplonk.hpp | 6 +++--- .../pcs => commitment_schemes}/shplonk/shplonk.test.cpp | 2 +- .../{honk/pcs => commitment_schemes}/verification_key.hpp | 2 +- .../{honk/pcs => commitment_schemes}/wrapper.hpp | 0 .../pcs => commitment_schemes}/zeromorph/zeromorph.hpp | 0 .../pcs => commitment_schemes}/zeromorph/zeromorph.test.cpp | 0 barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt | 2 +- barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp | 6 +++--- .../cpp/src/barretenberg/honk/flavor/goblin_translator.hpp | 4 ++-- .../cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp | 2 +- .../src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp | 4 ++-- barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp | 2 +- .../cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp | 4 ++-- .../cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp | 4 ++-- .../cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp | 4 ++-- .../src/barretenberg/honk/proof_system/eccvm_verifier.cpp | 4 ++-- .../honk/proof_system/goblin_merge/merge_prover.hpp | 2 +- .../honk/proof_system/goblin_merge/merge_verifier.hpp | 2 +- .../cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp | 2 +- .../src/barretenberg/honk/proof_system/ultra_verifier.cpp | 2 +- .../cpp/src/barretenberg/plonk/composer/composer_lib.cpp | 2 +- .../recursion/honk/verifier/ultra_recursive_verifier.cpp | 2 +- 34 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 barretenberg/cpp/src/barretenberg/commitment_schemes/CMakeLists.txt rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/claim.hpp (97%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/commitment_key.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/commitment_key.test.hpp (98%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/gemini/gemini.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/gemini/gemini.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/gemini/gemini.test.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/ipa/ipa.hpp (98%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/ipa/ipa.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/kzg/kzg.hpp (97%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/kzg/kzg.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/shplonk/shplonk.hpp (98%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/shplonk/shplonk.test.cpp (98%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/verification_key.hpp (98%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/wrapper.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/zeromorph/zeromorph.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/pcs => commitment_schemes}/zeromorph/zeromorph.test.cpp (100%) diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index fe5ec34f176..09750815165 100644 --- 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 new file mode 100644 index 00000000000..8467f3294d1 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(commitment_schemes common transcript polynomials ecc numeric srs) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/claim.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/claim.hpp index 05f405494f8..f532689e981 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp +++ b/barretenberg/cpp/src/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/cpp/src/barretenberg/honk/pcs/commitment_key.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/commitment_key.test.hpp index a32356b36c3..49e6dcd8838 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp +++ b/barretenberg/cpp/src/barretenberg/commitment_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/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.test.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/gemini/gemini.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.hpp index 700bfa7269d..7a46a3eb71e 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp +++ b/barretenberg/cpp/src/barretenberg/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 #include diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/ipa/ipa.test.cpp index e6d0333a8ab..7527aa2a1eb 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp +++ b/barretenberg/cpp/src/barretenberg/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 diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.hpp index d818e798f8b..f56018b2963 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp +++ b/barretenberg/cpp/src/barretenberg/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/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/kzg/kzg.test.cpp index 673ccddd7f7..9334ddaf482 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp +++ b/barretenberg/cpp/src/barretenberg/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/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.hpp index 9e4ccf701aa..54fed18e988 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp +++ b/barretenberg/cpp/src/barretenberg/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/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.test.cpp index 5e607d2f038..74cd152c21a 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp +++ b/barretenberg/cpp/src/barretenberg/commitment_schemes/shplonk/shplonk.test.cpp @@ -8,7 +8,7 @@ #include #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 ShplonkTest : public CommitmentTest {}; diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/verification_key.hpp index 8dc4492815e..49c77bebbdb 100644 --- a/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp +++ b/barretenberg/cpp/src/barretenberg/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/barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/wrapper.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/wrapper.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/zeromorph/zeromorph.hpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/pcs/zeromorph/zeromorph.hpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/pcs/zeromorph/zeromorph.test.cpp b/barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/pcs/zeromorph/zeromorph.test.cpp rename to barretenberg/cpp/src/barretenberg/commitment_schemes/zeromorph/zeromorph.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt index ac0dc30fd08..bfae9cf414b 100644 --- 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 index 3bb83245049..2f4725bd6a8 100644 --- 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 index 6de0d85fe03..0874821c1d0 100644 --- 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 index 968f5812a77..9912dcf5c18 100644 --- 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 index 3598048811d..ed5fc43c6ba 100644 --- 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 index e647fbe520e..4521e7dbd6e 100644 --- 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 index 191730c98c1..065b5df186b 100644 --- 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 index 649f8a9e078..a813731a202 100644 --- 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 index 01bf9330310..2754a6a4dc2 100644 --- 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 index 0446a8758f1..52995f0184e 100644 --- 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 index aef88482292..cc1f417586c 100644 --- 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 index 548e41c77f0..6635f04b6bd 100644 --- 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 index c1e5aacf245..ac7d4b4ad8c 100644 --- 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 index 1062e1af86f..8ec404d3d0d 100644 --- 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 index f12d1f66379..086636797b0 100644 --- 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/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp index 4ca548f84e4..7eaee3e2f23 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp +++ b/barretenberg/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" From 7b3c02f49c6897a667527eac0e8bfb97738d65c3 Mon Sep 17 00:00:00 2001 From: codygunton Date: Wed, 1 Nov 2023 22:04:22 +0000 Subject: [PATCH 2/2] Run commitment_schemes_tests in CI --- barretenberg/cpp/scripts/bb-tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh index 6441368ec0e..6054ec74a14 100755 --- 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