fix: revert helpers.test.*

AztecProtocol · Jan 22, 2024 · 415af1e · 415af1e
1 parent eebb62e
commit 415af1e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 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
@@ -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
@@ -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
@@ -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
diff --git 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