From 07183200b136ec39087c2b35e5799686319d561b Mon Sep 17 00:00:00 2001 From: Cody Gunton Date: Fri, 8 Mar 2024 14:29:39 -0500 Subject: [PATCH] refactor: Join-split example Part 2 (#5016) Flatten join_split_example/ and move inside of examples/ Follows: https://github.com/AztecProtocol/aztec-packages/pull/4965 --- .circleci/config.yml | 14 -------------- barretenberg/cpp/scripts/bb-tests.sh | 2 +- barretenberg/cpp/src/CMakeLists.txt | 3 +-- .../cpp/src/barretenberg/examples/CMakeLists.txt | 5 ++--- .../notes => examples/join_split}/CMakeLists.txt | 2 +- .../join_split/compute_signing_data.cpp | 2 +- .../join_split/compute_signing_data.hpp | 0 .../join_split}/constants.hpp | 0 .../proofs => examples}/join_split/index.hpp | 2 +- .../join_split}/inner_proof_data.cpp | 0 .../join_split}/inner_proof_data.hpp | 0 .../proofs => examples}/join_split/join_split.cpp | 2 +- .../proofs => examples}/join_split/join_split.hpp | 2 +- .../join_split/join_split.test.cpp | 8 ++++---- .../join_split/join_split_circuit.cpp | 12 ++++++------ .../join_split/join_split_circuit.hpp | 6 +++--- .../join_split/join_split_tx.cpp | 0 .../join_split/join_split_tx.hpp | 6 +++--- .../notes/circuit/account/account_note.hpp | 2 +- .../join_split}/notes/circuit/account/commit.hpp | 4 ++-- .../join_split}/notes/circuit/account/index.hpp | 0 .../join_split}/notes/circuit/asset_id.cpp | 4 ++-- .../join_split}/notes/circuit/asset_id.hpp | 2 +- .../join_split}/notes/circuit/bridge_call_data.hpp | 6 +++--- .../join_split}/notes/circuit/claim/claim_note.hpp | 6 +++--- .../circuit/claim/complete_partial_commitment.hpp | 4 ++-- .../notes/circuit/claim/compute_nullifier.hpp | 4 ++-- .../circuit/claim/create_partial_commitment.hpp | 4 ++-- .../join_split}/notes/circuit/claim/index.hpp | 0 .../notes/circuit/claim/witness_data.hpp | 10 +++++----- .../join_split}/notes/circuit/index.hpp | 0 .../join_split}/notes/circuit/value/commit.hpp | 0 .../circuit/value/complete_partial_commitment.hpp | 5 +++-- .../notes/circuit/value/compute_nullifier.cpp | 4 ++-- .../notes/circuit/value/compute_nullifier.hpp | 2 +- .../notes/circuit/value/compute_nullifier.test.cpp | 8 ++++---- .../circuit/value/create_partial_commitment.hpp | 4 ++-- .../join_split}/notes/circuit/value/index.hpp | 0 .../join_split}/notes/circuit/value/value_note.hpp | 2 +- .../notes/circuit/value/value_note.test.cpp | 8 ++++---- .../notes/circuit/value/witness_data.hpp | 4 ++-- .../join_split}/notes/constants.hpp | 2 +- .../notes/native/account/account_note.cpp | 2 +- .../notes/native/account/account_note.hpp | 2 +- .../compute_account_alias_hash_nullifier.hpp | 2 +- .../compute_account_public_key_nullifier.hpp | 2 +- .../join_split}/notes/native/account/index.hpp | 0 .../join_split}/notes/native/asset_id.cpp | 2 +- .../join_split}/notes/native/asset_id.hpp | 0 .../join_split}/notes/native/bridge_call_data.hpp | 2 +- .../join_split}/notes/native/claim/claim_note.hpp | 2 +- .../notes/native/claim/claim_note_tx_data.hpp | 2 +- .../native/claim/complete_partial_commitment.hpp | 2 +- .../notes/native/claim/compute_nullifier.hpp | 2 +- .../native/claim/create_partial_commitment.hpp | 2 +- .../join_split}/notes/native/claim/index.hpp | 0 .../join_split}/notes/native/index.hpp | 0 .../native/value/complete_partial_commitment.hpp | 2 +- .../notes/native/value/compute_nullifier.cpp | 2 +- .../notes/native/value/compute_nullifier.hpp | 0 .../native/value/create_partial_commitment.hpp | 2 +- .../join_split}/notes/native/value/index.hpp | 0 .../join_split}/notes/native/value/value_note.hpp | 0 .../join_split/sign_join_split_tx.cpp | 0 .../join_split/sign_join_split_tx.hpp | 2 +- .../join_split}/types.hpp | 0 .../join_split}/user_context.hpp | 0 .../proofs => examples/join_split}/verify.hpp | 0 .../join_split/verify_signature.hpp | 0 .../barretenberg/examples/simple/CMakeLists.txt | 3 +++ .../barretenberg/examples/{ => simple}/c_bind.cpp | 2 +- .../barretenberg/examples/{ => simple}/c_bind.hpp | 0 .../barretenberg/join_split_example/CMakeLists.txt | 1 - .../join_split_example/proofs/CMakeLists.txt | 3 --- .../proofs/inner_proof_data/CMakeLists.txt | 4 ---- .../proofs/join_split/CMakeLists.txt | 11 ----------- barretenberg/scripts/c_bind_files.txt | 2 +- 77 files changed, 88 insertions(+), 119 deletions(-) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs/notes => examples/join_split}/CMakeLists.txt (82%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/compute_signing_data.cpp (96%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/compute_signing_data.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example => examples/join_split}/constants.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/index.hpp (70%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs/inner_proof_data => examples/join_split}/inner_proof_data.cpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs/inner_proof_data => examples/join_split}/inner_proof_data.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/join_split.cpp (93%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/join_split.hpp (83%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/join_split.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/join_split_circuit.cpp (97%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/join_split_circuit.hpp (86%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/join_split_tx.cpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/join_split_tx.hpp (85%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/account/account_note.hpp (93%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/account/commit.hpp (83%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/account/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/asset_id.cpp (90%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/asset_id.hpp (84%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/bridge_call_data.hpp (98%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/claim/claim_note.hpp (90%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/claim/complete_partial_commitment.hpp (84%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/claim/compute_nullifier.hpp (90%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/claim/create_partial_commitment.hpp (86%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/claim/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/claim/witness_data.hpp (87%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/commit.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/complete_partial_commitment.hpp (85%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/compute_nullifier.cpp (94%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/compute_nullifier.hpp (85%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/compute_nullifier.test.cpp (80%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/create_partial_commitment.hpp (85%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/value_note.hpp (94%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/value_note.test.cpp (91%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/circuit/value/witness_data.hpp (89%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/constants.hpp (96%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/account/account_note.cpp (90%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/account/account_note.hpp (90%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/account/compute_account_alias_hash_nullifier.hpp (88%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/account/compute_account_public_key_nullifier.hpp (90%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/account/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/asset_id.cpp (91%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/asset_id.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/bridge_call_data.hpp (99%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/claim/claim_note.hpp (96%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/claim/claim_note_tx_data.hpp (94%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/claim/complete_partial_commitment.hpp (92%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/claim/compute_nullifier.hpp (89%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/claim/create_partial_commitment.hpp (92%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/claim/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/value/complete_partial_commitment.hpp (91%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/value/compute_nullifier.cpp (94%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/value/compute_nullifier.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/value/create_partial_commitment.hpp (93%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/value/index.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/notes/native/value/value_note.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/sign_join_split_tx.cpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/sign_join_split_tx.hpp (80%) rename barretenberg/cpp/src/barretenberg/{join_split_example => examples/join_split}/types.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/fixtures => examples/join_split}/user_context.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples/join_split}/verify.hpp (100%) rename barretenberg/cpp/src/barretenberg/{join_split_example/proofs => examples}/join_split/verify_signature.hpp (100%) create mode 100644 barretenberg/cpp/src/barretenberg/examples/simple/CMakeLists.txt rename barretenberg/cpp/src/barretenberg/examples/{ => simple}/c_bind.cpp (88%) rename barretenberg/cpp/src/barretenberg/examples/{ => simple}/c_bind.hpp (100%) delete mode 100644 barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt delete mode 100644 barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt delete mode 100644 barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt delete mode 100644 barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 0acf00890af..53da1c2f498 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -356,18 +356,6 @@ jobs: command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_recursion_tests --gtest_filter=-*turbo* aztec_manifest_key: barretenberg-x86_64-linux-clang-assert - barretenberg-join-split-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 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof* - aztec_manifest_key: barretenberg-x86_64-linux-clang-assert - barretenberg-acir-tests-bb: docker: - image: aztecprotocol/alpine-build-image @@ -1310,7 +1298,6 @@ workflows: - barretenberg-tests: *bb_test - barretenberg-stdlib-tests: *bb_test - barretenberg-stdlib-recursion-ultra-tests: *bb_test - - barretenberg-join-split-tests: *bb_test - barretenberg-acir-tests-bb: *bb_acir_tests - barretenberg-acir-tests-bb-sol: *bb_acir_tests - barretenberg-docs: *defaults @@ -1446,7 +1433,6 @@ workflows: - barretenberg-tests - barretenberg-stdlib-tests - barretenberg-stdlib-recursion-ultra-tests - - barretenberg-join-split-tests - barretenberg-acir-tests-bb - barretenberg-acir-tests-bb-sol - barretenberg-docs diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh index b0d91871ce9..623a3c4d9ef 100755 --- a/barretenberg/cpp/scripts/bb-tests.sh +++ b/barretenberg/cpp/scripts/bb-tests.sh @@ -23,6 +23,7 @@ TESTS=( goblin_tests client_ivc_tests dsl_tests + join_split_example_tests crypto_aes128_tests crypto_blake2s_tests crypto_blake3s_tests @@ -33,7 +34,6 @@ TESTS=( crypto_schnorr_tests crypto_sha256_tests ecc_tests - join_split_example_proofs_notes_tests numeric_tests plonk_tests polynomials_tests diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index 94cef6e7947..4550d65b658 100644 --- a/barretenberg/cpp/src/CMakeLists.txt +++ b/barretenberg/cpp/src/CMakeLists.txt @@ -63,7 +63,6 @@ add_subdirectory(barretenberg/flavor) add_subdirectory(barretenberg/goblin) add_subdirectory(barretenberg/grumpkin_srs_gen) add_subdirectory(barretenberg/honk) -add_subdirectory(barretenberg/join_split_example) add_subdirectory(barretenberg/numeric) add_subdirectory(barretenberg/plonk) add_subdirectory(barretenberg/polynomials) @@ -112,7 +111,7 @@ set(BARRETENBERG_TARGET_OBJECTS $ $ $ - $ + $ $ $ $ diff --git a/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt index 9b3d8f73ca0..6fdfc3a4fab 100644 --- a/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt @@ -1,3 +1,2 @@ -barretenberg_module(examples - stdlib_pedersen_commitment -) \ No newline at end of file +add_subdirectory(simple) +add_subdirectory(join_split) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/join_split/CMakeLists.txt similarity index 82% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/examples/join_split/CMakeLists.txt index ad23167bf65..231d9417364 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/CMakeLists.txt @@ -1,5 +1,5 @@ barretenberg_module( - join_split_example_proofs_notes + join_split_example crypto_schnorr stdlib_blake2s stdlib_sha256 diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.cpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.cpp index 4c9ec5f5082..0899a4bb11a 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.cpp @@ -1,6 +1,6 @@ #include "compute_signing_data.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" -#include "barretenberg/join_split_example/proofs/notes/native/index.hpp" +#include "barretenberg/examples/join_split/notes/native/index.hpp" namespace bb::join_split_example::proofs::join_split { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/compute_signing_data.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/constants.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/constants.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/index.hpp similarity index 70% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/index.hpp index 344d41b533d..be093cea627 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/index.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/join_split_example/fixtures/user_context.hpp" +#include "barretenberg/examples/join_split/user_context.hpp" #include "join_split.hpp" #include "join_split_circuit.hpp" #include "join_split_tx.hpp" diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.cpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/inner_proof_data.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.cpp similarity index 93% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split.cpp index 59ac8a19098..8a547d057df 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.cpp @@ -1,5 +1,5 @@ #include "join_split.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include "join_split_circuit.hpp" diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.hpp similarity index 83% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split.hpp index 3296346cf4b..c2e62daa713 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include "join_split_tx.hpp" diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split.test.cpp index 05c99e16d09..48d006ca3a1 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split.test.cpp @@ -4,10 +4,10 @@ #include "barretenberg/common/streams.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/crypto/merkle_tree/index.hpp" -#include "barretenberg/join_split_example/constants.hpp" -#include "barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp" -#include "barretenberg/join_split_example/proofs/notes/native/index.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/inner_proof_data.hpp" +#include "barretenberg/examples/join_split/notes/native/index.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "index.hpp" #include "join_split_circuit.hpp" diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.cpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.cpp index 580f3e7f7a2..d968ae593fd 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.cpp @@ -1,11 +1,11 @@ #include "join_split_circuit.hpp" #include "barretenberg/crypto/merkle_tree/membership.hpp" -#include "barretenberg/join_split_example/constants.hpp" -#include "barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp" -#include "barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp" -#include "barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp" -#include "barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/notes/circuit/account/account_note.hpp" +#include "barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp" +#include "barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp" +#include "barretenberg/examples/join_split/notes/circuit/value/value_note.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "verify_signature.hpp" namespace bb::join_split_example::proofs::join_split { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.hpp similarity index 86% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.hpp index 5aee2888920..709c3ebe544 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_circuit.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/crypto/schnorr/schnorr.hpp" -#include "barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp" -#include "barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp" +#include "barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "join_split_tx.hpp" namespace bb::join_split_example::proofs::join_split { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.cpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.hpp similarity index 85% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.hpp index 62c1564425b..b755ba82db3 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/join_split_tx.hpp @@ -1,9 +1,9 @@ #pragma once #include "barretenberg/crypto/merkle_tree/hash_path.hpp" #include "barretenberg/crypto/schnorr/schnorr.hpp" -#include "barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp" -#include "barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp" +#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::join_split { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/account_note.hpp similarity index 93% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/account_note.hpp index ca63f622847..d38d788359b 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/account_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "commit.hpp" namespace bb::join_split_example::proofs::notes::circuit::account { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/commit.hpp similarity index 83% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/commit.hpp index 77a38ebfee8..cfe203842f4 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/commit.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" namespace bb::join_split_example::proofs::notes::circuit::account { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/account/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.cpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.cpp index 4d966f9cc75..de30af7e847 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.cpp @@ -1,5 +1,5 @@ -#include "../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::notes::circuit { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.hpp similarity index 84% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.hpp index e62ae8e034a..9f7085e3d83 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/asset_id.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::notes::circuit { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp index d0d3015d974..47c77ecb11d 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../constants.hpp" -#include "../native/bridge_call_data.hpp" #include "./asset_id.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/notes/native/bridge_call_data.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::notes::circuit { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp index 385c99ae630..40557fe4087 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/claim_note.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/types.hpp" -#include "../bridge_call_data.hpp" -#include "../value/create_partial_commitment.hpp" +#include "barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp" +#include "barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" #include "create_partial_commitment.hpp" #include "witness_data.hpp" diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/complete_partial_commitment.hpp similarity index 84% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/complete_partial_commitment.hpp index a9ec8b99920..4f3a3f27ccb 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/complete_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" namespace bb::join_split_example::proofs::notes::circuit::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/compute_nullifier.hpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/compute_nullifier.hpp index cc07f1f4e16..058aa609f66 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/compute_nullifier.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" namespace bb::join_split_example::proofs::notes::circuit::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/create_partial_commitment.hpp similarity index 86% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/create_partial_commitment.hpp index 5217deb70e1..1ae8f930e20 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" namespace bb::join_split_example::proofs::notes::circuit::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp similarity index 87% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp index 32cb510348e..58ccc233340 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/claim/witness_data.hpp @@ -1,10 +1,10 @@ #pragma once -#include "../../constants.hpp" -#include "../../native/claim/claim_note.hpp" -#include "../../native/claim/claim_note_tx_data.hpp" -#include "../bridge_call_data.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/notes/circuit/bridge_call_data.hpp" +#include "barretenberg/examples/join_split/notes/native/claim/claim_note.hpp" +#include "barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::notes::circuit::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/commit.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/commit.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/complete_partial_commitment.hpp similarity index 85% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/complete_partial_commitment.hpp index 4ba7092534d..1457617687b 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/complete_partial_commitment.hpp @@ -1,8 +1,9 @@ #pragma once -#include "../../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/notes/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" + namespace bb::join_split_example::proofs::notes::circuit::value { inline auto complete_partial_commitment(field_ct const& value_note_partial_commitment, diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.cpp similarity index 94% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.cpp index 6a17318dfb1..ddca192a950 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.cpp @@ -1,6 +1,6 @@ #include "compute_nullifier.hpp" -#include "../../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/notes/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::notes::circuit { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp similarity index 85% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp index d2c26d6b2f8..a48ba92e520 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::notes::circuit { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.test.cpp similarity index 80% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.test.cpp index adb6b5aed9e..a55c0c77770 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/compute_nullifier.test.cpp @@ -1,9 +1,9 @@ -#include "../../native/value/compute_nullifier.hpp" -#include "../../../../fixtures/user_context.hpp" -#include "../../native/value/value_note.hpp" +#include "barretenberg/examples/join_split/notes/native/value/compute_nullifier.hpp" #include "./compute_nullifier.hpp" #include "./value_note.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp" +#include "barretenberg/examples/join_split/types.hpp" +#include "barretenberg/examples/join_split/user_context.hpp" #include namespace bb::join_split_example { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp similarity index 85% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp index 76247b194bc..6aed0ef0549 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../constants.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" namespace bb::join_split_example::proofs::notes::circuit::value { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.hpp similarity index 94% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.hpp index 64af0f9cb41..b52ef1b45c9 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/types.hpp" #include "commit.hpp" #include "witness_data.hpp" diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.test.cpp similarity index 91% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.test.cpp index e06ab6968f2..0c5393050af 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/value_note.test.cpp @@ -1,8 +1,8 @@ -#include "../../native/value/value_note.hpp" -#include "../../../../fixtures/user_context.hpp" -#include "../../constants.hpp" +#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp" #include "barretenberg/circuit_checker/circuit_checker.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/constants.hpp" +#include "barretenberg/examples/join_split/types.hpp" +#include "barretenberg/examples/join_split/user_context.hpp" #include "value_note.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp index 91cbb512896..63d7943e241 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/circuit/value/witness_data.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../native/value/value_note.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp" +#include "barretenberg/examples/join_split/types.hpp" namespace bb::join_split_example::proofs::notes::circuit::value { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/constants.hpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/constants.hpp index 9a081fd3249..6d177e337bd 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/constants.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../../constants.hpp" +#include "barretenberg/examples/join_split/constants.hpp" #include "barretenberg/numeric/uint256/uint256.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.cpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.cpp index 893602921a0..abc0f855f12 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.cpp @@ -1,6 +1,6 @@ #include "account_note.hpp" -#include "../../constants.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" +#include "barretenberg/examples/join_split/notes/constants.hpp" namespace bb::join_split_example::proofs::notes::native::account { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.hpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.hpp index b7970ab8841..dc598568751 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/account_note.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../../constants.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/examples/join_split/constants.hpp" namespace bb::join_split_example::proofs::notes::native::account { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_alias_hash_nullifier.hpp similarity index 88% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_alias_hash_nullifier.hpp index a5b6c805f6f..8ead4926a6f 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_alias_hash_nullifier.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../../constants.hpp" #include "account_note.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" +#include "barretenberg/examples/join_split/notes/constants.hpp" namespace bb::join_split_example::proofs::notes::native::account { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_public_key_nullifier.hpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_public_key_nullifier.hpp index 83ee8a6d1e3..b3ee7bc7882 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/compute_account_public_key_nullifier.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../../constants.hpp" #include "account_note.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" +#include "barretenberg/examples/join_split/constants.hpp" namespace bb::join_split_example::proofs::notes::native::account { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/account/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.cpp similarity index 91% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.cpp index 06b1387e793..c18ea761c83 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.cpp @@ -1,4 +1,4 @@ -#include "../constants.hpp" +#include "barretenberg/examples/join_split/constants.hpp" namespace bb::join_split_example::proofs::notes::native { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/asset_id.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/bridge_call_data.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/bridge_call_data.hpp index b27953722b1..cb87cbf7337 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/bridge_call_data.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../constants.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/examples/join_split/notes/constants.hpp" namespace bb::join_split_example::proofs::notes::native { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note.hpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note.hpp index b0574cad662..243a6b07643 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../bridge_call_data.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/examples/join_split/notes/native/bridge_call_data.hpp" #include "complete_partial_commitment.hpp" #include "create_partial_commitment.hpp" diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp similarity index 94% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp index ed3e72e5898..42697a1a97f 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/claim_note_tx_data.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../bridge_call_data.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/examples/join_split/notes/native/bridge_call_data.hpp" namespace bb::join_split_example::proofs::notes::native::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/complete_partial_commitment.hpp similarity index 92% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/complete_partial_commitment.hpp index 28a85963468..878d0e00e8e 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/complete_partial_commitment.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../../constants.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/examples/join_split/constants.hpp" namespace bb::join_split_example::proofs::notes::native::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/compute_nullifier.hpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/compute_nullifier.hpp index 5273720b6d9..766d222d4a3 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/compute_nullifier.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../../constants.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/examples/join_split/constants.hpp" namespace bb::join_split_example::proofs::notes::native::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/create_partial_commitment.hpp similarity index 92% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/create_partial_commitment.hpp index ef969a32805..d4597ada43d 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../constants.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" +#include "barretenberg/examples/join_split/constants.hpp" #include "claim_note.hpp" namespace bb::join_split_example::proofs::notes::native::claim { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/claim/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/complete_partial_commitment.hpp similarity index 91% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/complete_partial_commitment.hpp index 570ac1d2183..6bcd9609f3b 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/complete_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include "../../constants.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" +#include "barretenberg/examples/join_split/notes/constants.hpp" namespace bb::join_split_example::proofs::notes::native::value { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.cpp similarity index 94% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.cpp index 92b7843902f..b5bf5dfa809 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.cpp @@ -1,8 +1,8 @@ #include "compute_nullifier.hpp" -#include "../../constants.hpp" #include "barretenberg/crypto/blake2s/blake2s.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" +#include "barretenberg/examples/join_split/notes/constants.hpp" namespace bb::join_split_example::proofs::notes::native { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/compute_nullifier.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/create_partial_commitment.hpp similarity index 93% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/create_partial_commitment.hpp index 3ffdeca198b..04bd9aacd3c 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/create_partial_commitment.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../../constants.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/examples/join_split/constants.hpp" namespace bb::join_split_example::proofs::notes::native::value { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/index.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/index.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/value_note.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/notes/native/value/value_note.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.cpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.hpp similarity index 80% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.hpp index df0736d208b..d8536d10fe0 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp +++ b/barretenberg/cpp/src/barretenberg/examples/join_split/sign_join_split_tx.hpp @@ -1,6 +1,6 @@ #pragma once #include "barretenberg/crypto/schnorr/schnorr.hpp" -#include "barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp" +#include "barretenberg/examples/join_split/notes/native/value/value_note.hpp" #include "join_split_tx.hpp" namespace bb::join_split_example::proofs::join_split { diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/types.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/types.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/types.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/user_context.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/user_context.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/verify.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/verify.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp b/barretenberg/cpp/src/barretenberg/examples/join_split/verify_signature.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp rename to barretenberg/cpp/src/barretenberg/examples/join_split/verify_signature.hpp diff --git a/barretenberg/cpp/src/barretenberg/examples/simple/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/simple/CMakeLists.txt new file mode 100644 index 00000000000..45a4f0df36e --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/examples/simple/CMakeLists.txt @@ -0,0 +1,3 @@ +barretenberg_module(simple_example + stdlib_pedersen_commitment +) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp b/barretenberg/cpp/src/barretenberg/examples/simple/c_bind.cpp similarity index 88% rename from barretenberg/cpp/src/barretenberg/examples/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/examples/simple/c_bind.cpp index ea22eb39830..6dfeeb904e5 100644 --- a/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp +++ b/barretenberg/cpp/src/barretenberg/examples/simple/c_bind.cpp @@ -1,6 +1,6 @@ #include "c_bind.hpp" +#include "barretenberg/examples/simple/simple.hpp" #include "barretenberg/srs/global_crs.hpp" -#include "simple/simple.hpp" using namespace bb::stdlib::types; diff --git a/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp b/barretenberg/cpp/src/barretenberg/examples/simple/c_bind.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/examples/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/examples/simple/c_bind.hpp diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt deleted file mode 100644 index 3df3519f9f4..00000000000 --- a/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(proofs) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt deleted file mode 100644 index 33199f4865e..00000000000 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_subdirectory(inner_proof_data) -add_subdirectory(join_split) -add_subdirectory(notes) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt deleted file mode 100644 index cf08dccf714..00000000000 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -barretenberg_module( - join_split_example_proofs_inner_proof_data - numeric - ecc) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt deleted file mode 100644 index 9c90ad2ba84..00000000000 --- a/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -barretenberg_module( - join_split_example_proofs_join_split - join_split_example_proofs_inner_proof_data - join_split_example_proofs_notes - crypto_schnorr - stdlib_blake2s - stdlib_sha256 - stdlib_pedersen_commitment - stdlib_schnorr - stdlib_primitives - crypto_merkle_tree) \ No newline at end of file diff --git a/barretenberg/scripts/c_bind_files.txt b/barretenberg/scripts/c_bind_files.txt index 5b6f0ffc5d0..e799a3895f1 100644 --- a/barretenberg/scripts/c_bind_files.txt +++ b/barretenberg/scripts/c_bind_files.txt @@ -5,6 +5,6 @@ ./cpp/src/barretenberg/crypto/schnorr/c_bind.hpp ./cpp/src/barretenberg/crypto/aes128/c_bind.hpp ./cpp/src/barretenberg/srs/c_bind.hpp -./cpp/src/barretenberg/examples/c_bind.hpp +./cpp/src/barretenberg/examples/simple/c_bind.hpp ./cpp/src/barretenberg/common/c_bind.hpp ./cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp