From de63b6d7abdf2692a4ac4bf4d53984ef15c19184 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Tue, 7 Nov 2023 17:08:48 +0000 Subject: [PATCH] fix linker issues after master merge --- .../cpp/src/barretenberg/flavor/goblin_ultra.hpp | 16 ++++++++-------- .../relations/databus_lookup_relation.cpp | 0 .../relations/databus_lookup_relation.hpp | 2 +- .../databus_composer.test.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/databus_lookup_relation.cpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/databus_lookup_relation.hpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/databus_composer.test.cpp (96%) diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp index 6f6d4682b910..430fd9d7dad2 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp @@ -3,14 +3,14 @@ #include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" -#include "barretenberg/proof_system/relations/auxiliary_relation.hpp" -#include "barretenberg/proof_system/relations/databus_lookup_relation.hpp" -#include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" -#include "barretenberg/proof_system/relations/elliptic_relation.hpp" -#include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/databus_lookup_relation.hpp" +#include "barretenberg/relations/ecc_op_queue_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/transcript/transcript.hpp" #include "relation_definitions_fwd.hpp" diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/databus_lookup_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/databus_lookup_relation.cpp rename to barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.cpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/databus_lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/databus_lookup_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp index c9667549499c..4c3a81f5c4df 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/databus_lookup_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/databus_lookup_relation.hpp @@ -5,7 +5,7 @@ #include "barretenberg/common/constexpr_utils.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/databus_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/honk/composer/databus_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp index fbad88661b4b..54b4e38281b4 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/databus_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/databus_composer.test.cpp @@ -3,10 +3,10 @@ #include #include "barretenberg/common/log.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_prover.hpp" using namespace proof_system::honk;