Skip to content

Commit

Permalink
Move honk/pcs/ to commitment_schemes/
Browse files Browse the repository at this point in the history
  • Loading branch information
@codygunton
codygunton committed Nov 2, 2023
1 parent 4161be9 commit 86e3101
Show file tree
Hide file tree
Showing 34 changed files with 40 additions and 38 deletions.
1 change: 1 addition & 0 deletions barretenberg/cpp/src/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions barretenberg/cpp/src/barretenberg/commitment_schemes/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
barretenberg_module(commitment_schemes common transcript polynomials ecc numeric srs)
2 changes: 1 addition & 1 deletion ...g/cpp/src/barretenberg/honk/pcs/claim.hpp → ...barretenberg/commitment_schemes/claim.hpp
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
0 .../barretenberg/honk/pcs/commitment_key.hpp → ...erg/commitment_schemes/commitment_key.hpp
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...etenberg/honk/pcs/commitment_key.test.hpp → ...ommitment_schemes/commitment_key.test.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
0 ...c/barretenberg/honk/pcs/gemini/gemini.cpp → ...berg/commitment_schemes/gemini/gemini.cpp
View file
File renamed without changes.
0 ...c/barretenberg/honk/pcs/gemini/gemini.hpp → ...berg/commitment_schemes/gemini/gemini.hpp
View file
File renamed without changes.
0 ...retenberg/honk/pcs/gemini/gemini.test.cpp → ...commitment_schemes/gemini/gemini.test.cpp
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp → ...rretenberg/commitment_schemes/ipa/ipa.hpp
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/barretenberg/honk/pcs/ipa/ipa.test.cpp → ...nberg/commitment_schemes/ipa/ipa.test.cpp
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp → ...rretenberg/commitment_schemes/kzg/kzg.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion ...rc/barretenberg/honk/pcs/kzg/kzg.test.cpp → ...nberg/commitment_schemes/kzg/kzg.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions ...barretenberg/honk/pcs/shplonk/shplonk.hpp → ...rg/commitment_schemes/shplonk/shplonk.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"

/**
Expand Down
2 changes: 1 addition & 1 deletion ...tenberg/honk/pcs/shplonk/shplonk.test.cpp → ...mmitment_schemes/shplonk/shplonk.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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> {};
Expand Down
2 changes: 1 addition & 1 deletion ...arretenberg/honk/pcs/verification_key.hpp → ...g/commitment_schemes/verification_key.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...cpp/src/barretenberg/honk/pcs/wrapper.hpp → ...rretenberg/commitment_schemes/wrapper.hpp
View file
File renamed without changes.
0 ...etenberg/honk/pcs/zeromorph/zeromorph.hpp → ...ommitment_schemes/zeromorph/zeromorph.hpp
View file
File renamed without changes.
0 ...erg/honk/pcs/zeromorph/zeromorph.test.cpp → ...ment_schemes/zeromorph/zeromorph.test.cpp
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/honk/flavor/goblin_translator.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.cpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 86e3101

Please sign in to comment.