remove use of stdlib/primitives/composers files outside stdlib

AztecProtocol · Jun 15, 2023 · 9691ba8 · 9691ba8
1 parent cf3f95f
commit 9691ba8
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 9 deletions.
diff --git a/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp
@@ -2,8 +2,7 @@
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include <benchmark/benchmark.h>
 #include <cstddef>
-#include "barretenberg/stdlib/primitives/composers/composers_fwd.hpp"
-#include "barretenberg/stdlib/primitives/composers/composers.hpp"
+#include "barretenberg/honk/composer/ultra_honk_composer.hpp"
 #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
 #include "barretenberg/stdlib/hash/keccak/keccak.hpp"
 #include "barretenberg/stdlib/primitives/curves/secp256k1.hpp"

diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
@@ -1,6 +1,5 @@
 #include "acir_format.hpp"
 #include "barretenberg/common/log.hpp"
-#include "barretenberg/stdlib/primitives/composers/composers.hpp"
 
 namespace acir_format {
 

diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp
@@ -13,7 +13,6 @@
 #include "pedersen.hpp"
 #include "hash_to_field.hpp"
 #include "barretenberg/dsl/types.hpp"
-#include "barretenberg/stdlib/primitives/composers/composers_fwd.hpp"
 
 namespace acir_format {
 

diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp
@@ -5,7 +5,6 @@
 #include "barretenberg/common/streams.hpp"
 #include "barretenberg/serialize/test_helper.hpp"
 #include "ecdsa_secp256k1.hpp"
-#include "barretenberg/stdlib/primitives/composers/composers.hpp"
 
 TEST(acir_format, test_a_single_constraint_no_pub_inputs)
 {

diff --git a/cpp/src/barretenberg/honk/composer/ultra_honk_composer.hpp b/cpp/src/barretenberg/honk/composer/ultra_honk_composer.hpp
@@ -293,8 +293,6 @@ template <class Flavor> class UltraHonkComposer_ {
     const std::string& err() const { return circuit_constructor.err(); };
     void failure(std::string msg) { circuit_constructor.failure(msg); }
 };
-template class UltraHonkComposer_<honk::flavor::Ultra>;
-template class UltraHonkComposer_<honk::flavor::UltraGrumpkin>;
 using UltraHonkComposer = UltraHonkComposer_<honk::flavor::Ultra>;
 using UltraGrumpkinHonkComposer = UltraHonkComposer_<honk::flavor::UltraGrumpkin>;
 

diff --git a/cpp/src/barretenberg/stdlib/primitives/composers/composers_fwd.hpp b/cpp/src/barretenberg/stdlib/primitives/composers/composers_fwd.hpp
@@ -1,10 +1,10 @@
 /**
  * @brief Defines particular composer and circuit constructor types expected to be used for proof or circuit
-construction (outside the proof_system and honk folder) and contains macros for explicit instantiation.
+construction in stdlib and contains macros for explicit instantiation.
  *
  * @details This file is designed to be included in header files to instruct the compiler that these classes exist and
  * their instantiation will eventually take place. Given it has no dependencies, it causes no additional compilation or
- *  propagation. This should be the ONLY file related to these types included in files out side the proof system.
+ *  propagation.
  */
 #pragma once