refactor: Join-split example Part 2 (#5016)

Flatten join_split_example/ and move inside of examples/ Follows: #4965
AztecProtocol · Mar 8, 2024 · 0718320 · 0718320
1 parent 53b2381
commit 0718320
Show file tree

Hide file tree

Showing 77 changed files with 88 additions and 119 deletions.
diff --git 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
@@ -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
@@ -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
     $<TARGET_OBJECTS:dsl_objects>
     $<TARGET_OBJECTS:ecc_objects>
     $<TARGET_OBJECTS:eccvm_objects>
-    $<TARGET_OBJECTS:examples_objects>
+    $<TARGET_OBJECTS:simple_example_objects>
     $<TARGET_OBJECTS:flavor_objects>
     $<TARGET_OBJECTS:goblin_objects>
     $<TARGET_OBJECTS:honk_objects>

diff --git 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
-)
+add_subdirectory(simple)
+add_subdirectory(join_split)
diff --git a/...split_example/proofs/notes/CMakeLists.txt → ...enberg/examples/join_split/CMakeLists.txt b/...split_example/proofs/notes/CMakeLists.txt → ...enberg/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/...roofs/join_split/compute_signing_data.cpp → ...mples/join_split/compute_signing_data.cpp b/...roofs/join_split/compute_signing_data.cpp → ...mples/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/...roofs/join_split/compute_signing_data.hpp → ...mples/join_split/compute_signing_data.hpp b/...roofs/join_split/compute_signing_data.hpp → ...mples/join_split/compute_signing_data.hpp
diff --git a/...etenberg/join_split_example/constants.hpp → ...tenberg/examples/join_split/constants.hpp b/...etenberg/join_split_example/constants.hpp → ...tenberg/examples/join_split/constants.hpp
diff --git a/...split_example/proofs/join_split/index.hpp → ...arretenberg/examples/join_split/index.hpp b/...split_example/proofs/join_split/index.hpp → ...arretenberg/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/...ofs/inner_proof_data/inner_proof_data.cpp → .../examples/join_split/inner_proof_data.cpp b/...ofs/inner_proof_data/inner_proof_data.cpp → .../examples/join_split/inner_proof_data.cpp
diff --git a/...ofs/inner_proof_data/inner_proof_data.hpp → .../examples/join_split/inner_proof_data.hpp b/...ofs/inner_proof_data/inner_proof_data.hpp → .../examples/join_split/inner_proof_data.hpp
diff --git a/..._example/proofs/join_split/join_split.cpp → ...enberg/examples/join_split/join_split.cpp b/..._example/proofs/join_split/join_split.cpp → ...enberg/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/..._example/proofs/join_split/join_split.hpp → ...enberg/examples/join_split/join_split.hpp b/..._example/proofs/join_split/join_split.hpp → ...enberg/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/...ple/proofs/join_split/join_split.test.cpp → ...g/examples/join_split/join_split.test.cpp b/...ple/proofs/join_split/join_split.test.cpp → ...g/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/.../proofs/join_split/join_split_circuit.cpp → ...xamples/join_split/join_split_circuit.cpp b/.../proofs/join_split/join_split_circuit.cpp → ...xamples/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/.../proofs/join_split/join_split_circuit.hpp → ...xamples/join_split/join_split_circuit.hpp b/.../proofs/join_split/join_split_circuit.hpp → ...xamples/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/...ample/proofs/join_split/join_split_tx.cpp → ...erg/examples/join_split/join_split_tx.cpp b/...ample/proofs/join_split/join_split_tx.cpp → ...erg/examples/join_split/join_split_tx.cpp
diff --git a/...ample/proofs/join_split/join_split_tx.hpp → ...erg/examples/join_split/join_split_tx.hpp b/...ample/proofs/join_split/join_split_tx.hpp → ...erg/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/...fs/notes/circuit/account/account_note.hpp → ...it/notes/circuit/account/account_note.hpp b/...fs/notes/circuit/account/account_note.hpp → ...it/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/...e/proofs/notes/circuit/account/commit.hpp → ...in_split/notes/circuit/account/commit.hpp b/...e/proofs/notes/circuit/account/commit.hpp → ...in_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/...le/proofs/notes/circuit/account/index.hpp → ...oin_split/notes/circuit/account/index.hpp b/...le/proofs/notes/circuit/account/index.hpp → ...oin_split/notes/circuit/account/index.hpp
diff --git a/...example/proofs/notes/circuit/asset_id.cpp → ...les/join_split/notes/circuit/asset_id.cpp b/...example/proofs/notes/circuit/asset_id.cpp → ...les/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/...example/proofs/notes/circuit/asset_id.hpp → ...les/join_split/notes/circuit/asset_id.hpp b/...example/proofs/notes/circuit/asset_id.hpp → ...les/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/...proofs/notes/circuit/bridge_call_data.hpp → ..._split/notes/circuit/bridge_call_data.hpp b/...proofs/notes/circuit/bridge_call_data.hpp → ..._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/...proofs/notes/circuit/claim/claim_note.hpp → ..._split/notes/circuit/claim/claim_note.hpp b/...proofs/notes/circuit/claim/claim_note.hpp → ..._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/...uit/claim/complete_partial_commitment.hpp → ...uit/claim/complete_partial_commitment.hpp b/...uit/claim/complete_partial_commitment.hpp → ...uit/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/...notes/circuit/claim/compute_nullifier.hpp → ...notes/circuit/claim/compute_nullifier.hpp b/...notes/circuit/claim/compute_nullifier.hpp → ...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/...rcuit/claim/create_partial_commitment.hpp → ...rcuit/claim/create_partial_commitment.hpp b/...rcuit/claim/create_partial_commitment.hpp → ...rcuit/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/...mple/proofs/notes/circuit/claim/index.hpp → .../join_split/notes/circuit/claim/index.hpp b/...mple/proofs/notes/circuit/claim/index.hpp → .../join_split/notes/circuit/claim/index.hpp
diff --git a/...oofs/notes/circuit/claim/witness_data.hpp → ...plit/notes/circuit/claim/witness_data.hpp b/...oofs/notes/circuit/claim/witness_data.hpp → ...plit/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/...it_example/proofs/notes/circuit/index.hpp → ...amples/join_split/notes/circuit/index.hpp b/...it_example/proofs/notes/circuit/index.hpp → ...amples/join_split/notes/circuit/index.hpp
diff --git a/...ple/proofs/notes/circuit/value/commit.hpp → ...join_split/notes/circuit/value/commit.hpp b/...ple/proofs/notes/circuit/value/commit.hpp → ...join_split/notes/circuit/value/commit.hpp
diff --git a/...uit/value/complete_partial_commitment.hpp → ...uit/value/complete_partial_commitment.hpp b/...uit/value/complete_partial_commitment.hpp → ...uit/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/...notes/circuit/value/compute_nullifier.cpp → ...notes/circuit/value/compute_nullifier.cpp b/...notes/circuit/value/compute_nullifier.cpp → ...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/...notes/circuit/value/compute_nullifier.hpp → ...notes/circuit/value/compute_nullifier.hpp b/...notes/circuit/value/compute_nullifier.hpp → ...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/.../circuit/value/compute_nullifier.test.cpp → .../circuit/value/compute_nullifier.test.cpp b/.../circuit/value/compute_nullifier.test.cpp → .../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 <gtest/gtest.h>
 
 namespace bb::join_split_example {

diff --git a/...rcuit/value/create_partial_commitment.hpp → ...rcuit/value/create_partial_commitment.hpp b/...rcuit/value/create_partial_commitment.hpp → ...rcuit/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/...mple/proofs/notes/circuit/value/index.hpp → .../join_split/notes/circuit/value/index.hpp b/...mple/proofs/notes/circuit/value/index.hpp → .../join_split/notes/circuit/value/index.hpp
diff --git a/...proofs/notes/circuit/value/value_note.hpp → ..._split/notes/circuit/value/value_note.hpp b/...proofs/notes/circuit/value/value_note.hpp → ..._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/...s/notes/circuit/value/value_note.test.cpp → ...t/notes/circuit/value/value_note.test.cpp b/...s/notes/circuit/value/value_note.test.cpp → ...t/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 <gtest/gtest.h>
 

diff --git a/...oofs/notes/circuit/value/witness_data.hpp → ...plit/notes/circuit/value/witness_data.hpp b/...oofs/notes/circuit/value/witness_data.hpp → ...plit/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/..._split_example/proofs/notes/constants.hpp → ...g/examples/join_split/notes/constants.hpp b/..._split_example/proofs/notes/constants.hpp → ...g/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 <stddef.h>
 

diff --git a/...ofs/notes/native/account/account_note.cpp → ...lit/notes/native/account/account_note.cpp b/...ofs/notes/native/account/account_note.cpp → ...lit/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/...ofs/notes/native/account/account_note.hpp → ...lit/notes/native/account/account_note.hpp b/...ofs/notes/native/account/account_note.hpp → ...lit/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/.../compute_account_alias_hash_nullifier.hpp → .../compute_account_alias_hash_nullifier.hpp b/.../compute_account_alias_hash_nullifier.hpp → .../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/.../compute_account_public_key_nullifier.hpp → .../compute_account_public_key_nullifier.hpp b/.../compute_account_public_key_nullifier.hpp → .../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/...ple/proofs/notes/native/account/index.hpp → ...join_split/notes/native/account/index.hpp b/...ple/proofs/notes/native/account/index.hpp → ...join_split/notes/native/account/index.hpp
diff --git a/..._example/proofs/notes/native/asset_id.cpp → ...ples/join_split/notes/native/asset_id.cpp b/..._example/proofs/notes/native/asset_id.cpp → ...ples/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/..._example/proofs/notes/native/asset_id.hpp → ...ples/join_split/notes/native/asset_id.hpp b/..._example/proofs/notes/native/asset_id.hpp → ...ples/join_split/notes/native/asset_id.hpp