From a31869d0720fac41aeae76448f97304eab169939 Mon Sep 17 00:00:00 2001
From: maramihali <mara@aztecprotocol.com>
Date: Tue, 13 Jun 2023 21:24:21 +0000
Subject: [PATCH] remove use of stdlib/primitives/composers files outside
 stdlib

---
 cpp/src/barretenberg/dsl/acir_format/acir_format.cpp          | 1 -
 cpp/src/barretenberg/dsl/acir_format/acir_format.hpp          | 1 -
 cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp     | 1 -
 cpp/src/barretenberg/honk/composer/ultra_honk_composer.hpp    | 2 --
 .../barretenberg/stdlib/primitives/composers/composers.hpp    | 3 ---
 .../stdlib/primitives/composers/composers_fwd.hpp             | 4 ++--
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
index 41374f841e..9a7ca42767 100644
--- 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
index 40bbe871e3..6e6857d83a 100644
--- 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
index 43954df2cd..545cab88b5 100644
--- 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
index e70e37f63d..c37dc4da08 100644
--- 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.hpp b/cpp/src/barretenberg/stdlib/primitives/composers/composers.hpp
index 6ab1223240..c1522e0ac8 100644
--- a/cpp/src/barretenberg/stdlib/primitives/composers/composers.hpp
+++ b/cpp/src/barretenberg/stdlib/primitives/composers/composers.hpp
@@ -1,9 +1,6 @@
 /**
  * @brief Contains all the headers required to adequately compile the types defined in composers_fwd.hpp and instantiate
  * templates.
- *
- * @details This should be the ONLY file related to composer/circuit construct included in source files not part of the
- * proof systems.
  */
 #pragma once
 #include "barretenberg/plonk/composer/standard_plonk_composer.hpp"
diff --git a/cpp/src/barretenberg/stdlib/primitives/composers/composers_fwd.hpp b/cpp/src/barretenberg/stdlib/primitives/composers/composers_fwd.hpp
index 3d5570a276..1fb6e8d389 100644
--- 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