move gob to stdlib; test passes w merge rec ver

barretenberg/cpp/src/CMakeLists.txt

@@ -59,7 +59,6 @@ add_subdirectory(barretenberg/env)
 add_subdirectory(barretenberg/examples)
 add_subdirectory(barretenberg/flavor)
 add_subdirectory(barretenberg/grumpkin_srs_gen)
-add_subdirectory(barretenberg/goblin)
 add_subdirectory(barretenberg/honk)
 add_subdirectory(barretenberg/join_split_example)
 add_subdirectory(barretenberg/numeric)

barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp

@@ -2,11 +2,11 @@
 #include "barretenberg/commitment_schemes/gemini/gemini.hpp"
 #include "barretenberg/commitment_schemes/shplonk/shplonk.hpp"
 #include "barretenberg/flavor/ecc_vm.hpp"
-#include "barretenberg/goblin/translation_evaluations.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/translator_vm/translation_evaluations.hpp"
 
 namespace proof_system::honk {
 

barretenberg/cpp/src/barretenberg/stdlib/recursion/goblin/full_goblin_recursion.test.cpp

@@ -1,12 +1,12 @@
 #include "barretenberg/eccvm/eccvm_composer.hpp"
-#include "barretenberg/goblin/goblin.hpp"
-#include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/goblin/translation_evaluations.hpp"
 #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/stdlib/recursion/goblin/goblin.hpp"
+#include "barretenberg/stdlib/recursion/goblin/mock_circuits.hpp"
 #include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp"
 #include "barretenberg/translator_vm/goblin_translator_composer.hpp"
+#include "barretenberg/translator_vm/translation_evaluations.hpp"
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 #include <gtest/gtest.h>
@@ -40,7 +40,8 @@ class GoblinRecursionTests : public ::testing::Test {
     using NativeVerificationKey = flavor::GoblinUltra::VerificationKey;
     using RecursiveFlavor = flavor::GoblinUltraRecursive_<GoblinUltraBuilder>;
     using RecursiveVerifier = proof_system::plonk::stdlib::recursion::honk::UltraRecursiveVerifier_<RecursiveFlavor>;
-    using KernelInput = Goblin::AccumulationOutput;
+    using Goblin = proof_system::plonk::stdlib::recursion::goblin::Goblin;
+    using KernelInput = proof_system::plonk::stdlib::recursion::goblin::Goblin::AccumulationOutput;
 
     /**
      * @brief Construct a mock kernel circuit
@@ -72,7 +73,7 @@ class GoblinRecursionTests : public ::testing::Test {
  */
 TEST_F(GoblinRecursionTests, Pseudo)
 {
-    barretenberg::Goblin goblin;
+    Goblin goblin;
 
     // Construct an initial circuit; its proof will be recursively verified by the first kernel
     GoblinUltraBuilder initial_circuit{ goblin.op_queue };

barretenberg/cpp/src/barretenberg/goblin/goblin.hpp → barretenberg/cpp/src/barretenberg/stdlib/recursion/goblin/goblin.hpp

@@ -8,7 +8,7 @@
 #include "barretenberg/translator_vm/goblin_translator_composer.hpp"
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 
-namespace barretenberg {
+namespace proof_system::plonk::stdlib::recursion::goblin {
 
 class Goblin {
     using HonkProof = proof_system::plonk::proof;
@@ -68,7 +68,6 @@ class Goblin {
         // issue (https://github.com/AztecProtocol/barretenberg/issues/723)
         if (verify_merge) {
             RecursiveMergeVerifier merge_verifier{ &circuit_builder };
-            // Recursively verify the merge proof constructed on the previous call to accumulate
             [[maybe_unused]] auto pairing_points = merge_verifier.verify_proof(merge_proof);
         }
 
@@ -115,4 +114,4 @@ class Goblin {
         return eccvm_verified && accumulator_construction_verified && translation_verified;
     };
 };
-} // namespace barretenberg
+} // namespace proof_system::plonk::stdlib::recursion::goblin

barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp → barretenberg/cpp/src/barretenberg/stdlib/recursion/goblin/mock_circuits.hpp

@@ -1,11 +1,10 @@
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/eccvm/eccvm_composer.hpp"
-#include "barretenberg/goblin/goblin.hpp"
-#include "barretenberg/goblin/translation_evaluations.hpp"
 #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/translator_vm/goblin_translator_composer.hpp"
+#include "barretenberg/translator_vm/translation_evaluations.hpp"
 #include "barretenberg/ultra_honk/ultra_composer.hpp"
 
 namespace barretenberg {

barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/flavor/goblin_translator.hpp"
-#include "barretenberg/goblin/translation_evaluations.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
+#include "barretenberg/translator_vm/translation_evaluations.hpp"
 
 namespace proof_system::honk {
 class GoblinTranslatorVerifier {