From 415af1ed1c368362732a952772f9d2da4eebc8dd Mon Sep 17 00:00:00 2001
From: ludamad <adam@aztecprotocol.com>
Date: Mon, 22 Jan 2024 22:09:10 +0000
Subject: [PATCH] fix: revert helpers.test.*

---
 .../src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp  | 2 +-
 .../barretenberg/vm/tests/AvmMini_control_flow.test.cpp    | 2 +-
 .../cpp/src/barretenberg/vm/tests/helpers.test.cpp         | 4 ++--
 .../cpp/src/barretenberg/vm/tests/helpers.test.hpp         | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp
index 7d7ce2d3ec2..d250c8c305b 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_arithmetic.test.cpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-using namespace avm_trace;
+using namespace bb;
 
 class AvmMiniArithmeticTests : public ::testing::Test {
   public:
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp
index c44ade71385..a050ddd5d64 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/AvmMini_control_flow.test.cpp
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-using namespace avm_trace;
+using namespace bb;
 
 class AvmMiniControlFlowTests : public ::testing::Test {
   public:
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
index dd3d83b616b..3a38e6fbc83 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.cpp
@@ -5,8 +5,7 @@
 #include "barretenberg/vm/generated/AvmMini_verifier.hpp"
 #include <gtest/gtest.h>
 
-using namespace avm_trace;
-
+namespace avm_trace {
 /**
  * @brief Helper routine proving and verifying a proof based on the supplied trace
  *
@@ -62,3 +61,4 @@ void mutate_ic_in_trace(std::vector<Row>& trace, std::function<bool(Row)>&& sele
     EXPECT_TRUE(mem_row != trace.end());
     mem_row->memTrace_m_val = newValue;
 };
+} // namespace avm_trace
\ No newline at end of file
diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp
index b1fa9fdf597..35c8b8bca19 100644
--- a/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm/tests/helpers.test.hpp
@@ -10,6 +10,7 @@
         std::string message = e.what();                                                                                \
         EXPECT_TRUE(message.find(expectedMessage) != std::string::npos);                                               \
     }
-
-void validate_trace_proof(std::vector<Row>&& trace);
-void mutate_ic_in_trace(std::vector<Row>& trace, std::function<bool(Row)>&& selectRow, FF const& newValue);
+namespace avm_trace {
+void avm_validate_trace_proof(std::vector<Row>&& trace);
+void avm_mutate_ic_in_trace(std::vector<Row>& trace, std::function<bool(Row)>&& selectRow, FF const& newValue);
+} // namespace avm_trace