perf: split ultra honk test circuit helper

Author: ludamad

barretenberg/cpp/src/barretenberg/ultra_honk/databus.test.cpp

@@ -5,11 +5,11 @@
 
 #include "barretenberg/circuit_checker/circuit_checker.hpp"
 #include "barretenberg/common/log.hpp"
-#include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/honk/prover_instance_inspector.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
 
+#include "barretenberg/ultra_honk/mega_circuit_test_helper.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 
@@ -48,7 +48,7 @@ template <typename Flavor> class DataBusTests : public ::testing::Test {
     {
         auto op_queue = std::make_shared<bb::ECCOpQueue>();
         auto builder = MegaCircuitBuilder{ op_queue };
-        GoblinMockCircuits::construct_simple_circuit(builder);
+        MegaCircuitTestHelper::construct_simple_circuit(builder);
         return builder;
     }
 

barretenberg/cpp/src/barretenberg/ultra_honk/mega_circuit_test_helper.hpp

@@ -0,0 +1,37 @@
+#pragma once
+
+#include "barretenberg/numeric/random/engine.hpp"
+#include "barretenberg/stdlib/special_public_inputs/special_public_inputs.hpp"
+#include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
+#include "barretenberg/stdlib_circuit_builders/mock_circuits.hpp"
+
+namespace bb {
+
+class MegaCircuitTestHelper {
+  public:
+    using Curve = curve::BN254;
+    using FF = Curve::ScalarField;
+    using Point = Curve::AffineElement;
+
+    static void add_some_ecc_op_gates(MegaCircuitBuilder& builder)
+    {
+        auto& engine = numeric::get_debug_randomness();
+
+        for (size_t i = 0; i < 3; ++i) {
+            auto point = Point::random_element(&engine);
+            auto scalar = FF::random_element(&engine);
+            builder.queue_ecc_add_accum(point);
+            builder.queue_ecc_mul_accum(point, scalar);
+        }
+        builder.queue_ecc_eq();
+    }
+
+    static void construct_simple_circuit(MegaCircuitBuilder& builder)
+    {
+        add_some_ecc_op_gates(builder);
+        MockCircuits::construct_arithmetic_circuit(builder);
+        stdlib::recursion::honk::DefaultIO<MegaCircuitBuilder>::add_default(builder);
+    }
+};
+
+} // namespace bb

barretenberg/cpp/src/barretenberg/ultra_honk/mega_honk.test.cpp

@@ -3,11 +3,12 @@
 #include <gtest/gtest.h>
 
 #include "barretenberg/common/log.hpp"
-#include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/honk/proof_length.hpp"
 #include "barretenberg/honk/relation_checker.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
+#include "barretenberg/stdlib_circuit_builders/mock_circuits.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
+#include "barretenberg/ultra_honk/mega_circuit_test_helper.hpp"
 #include "barretenberg/ultra_honk/oink_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
@@ -90,7 +91,7 @@ TYPED_TEST(MegaHonkTests, Basic)
     using Flavor = TypeParam;
     typename Flavor::CircuitBuilder builder;
 
-    GoblinMockCircuits::construct_simple_circuit(builder);
+    MegaCircuitTestHelper::construct_simple_circuit(builder);
 
     // Construct and verify Honk proof
     bool honk_verified = this->construct_and_verify_honk_proof(builder);
@@ -115,7 +116,7 @@ TYPED_TEST(MegaHonkTests, DynamicVirtualSizeIncrease)
     using Prover = UltraProver_<Flavor>;
     using Verifier = UltraVerifier_<Flavor, DefaultIO>;
 
-    GoblinMockCircuits::construct_simple_circuit(builder);
+    MegaCircuitTestHelper::construct_simple_circuit(builder);
 
     auto builder_copy = builder;
 
@@ -179,7 +180,7 @@ TYPED_TEST(MegaHonkTests, PolySwap)
 
     // Construct a simple circuit and make a copy of it
     Builder builder;
-    GoblinMockCircuits::construct_simple_circuit(builder);
+    MegaCircuitTestHelper::construct_simple_circuit(builder);
     auto builder_copy = builder;
 
     // Construct two identical proving keys
@@ -238,7 +239,7 @@ TYPED_TEST(MegaHonkTests, DyadicSizeJumpsToProtectMaskingArea)
 
         // Determine the baseline dyadic size (with ECC ops + finalization overhead, no extra user gates)
         Builder baseline_builder;
-        GoblinMockCircuits::construct_simple_circuit(baseline_builder);
+        MegaCircuitTestHelper::construct_simple_circuit(baseline_builder);
         auto baseline_instance = std::make_shared<ProverInstance>(baseline_builder);
         const size_t baseline_dyadic = baseline_instance->dyadic_size();
 
@@ -248,7 +249,7 @@ TYPED_TEST(MegaHonkTests, DyadicSizeJumpsToProtectMaskingArea)
         bool found_jump = false;
         for (size_t num_extra_gates = 0; num_extra_gates <= baseline_dyadic; num_extra_gates++) {
             Builder builder;
-            GoblinMockCircuits::construct_simple_circuit(builder);
+            MegaCircuitTestHelper::construct_simple_circuit(builder);
             if (num_extra_gates > 0) {
                 MockCircuits::add_arithmetic_gates(builder, num_extra_gates);
             }
@@ -266,7 +267,7 @@ TYPED_TEST(MegaHonkTests, DyadicSizeJumpsToProtectMaskingArea)
 
                 // Prove and verify at the tightest packing (right before the jump)
                 Builder tight_builder;
-                GoblinMockCircuits::construct_simple_circuit(tight_builder);
+                MegaCircuitTestHelper::construct_simple_circuit(tight_builder);
                 MockCircuits::add_arithmetic_gates(tight_builder, num_extra_gates - 1);
                 bool verified = this->construct_and_verify_honk_proof(tight_builder);
                 EXPECT_TRUE(verified);
@@ -296,7 +297,7 @@ TYPED_TEST(MegaHonkTests, WitnessPolynomialsMasked)
         using Builder = typename Flavor::CircuitBuilder;
 
         Builder builder;
-        GoblinMockCircuits::construct_simple_circuit(builder);
+        MegaCircuitTestHelper::construct_simple_circuit(builder);
         auto prover_instance = std::make_shared<ProverInstance_<Flavor>>(builder);
 
         auto check_masked = [](const auto& poly, const std::string& label) {

barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.test.cpp

@@ -1,6 +1,5 @@
 #include "barretenberg/ultra_honk/oink_prover.hpp"
-#include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/stdlib_circuit_builders/mock_circuits.hpp"
+#include "barretenberg/ultra_honk/mega_circuit_test_helper.hpp"
 #include "barretenberg/ultra_honk/oink_verifier.hpp"
 #include "barretenberg/ultra_honk/prover_instance.hpp"
 
@@ -29,7 +28,7 @@ class OinkTests : public ::testing::Test {
 TEST_F(OinkTests, OinkProverIsDeterministic)
 {
     Builder circuit;
-    GoblinMockCircuits::construct_simple_circuit(circuit);
+    MegaCircuitTestHelper::construct_simple_circuit(circuit);
     auto prover_instance = std::make_shared<ProverInstance>(circuit);
     auto verification_key = std::make_shared<VerificationKey>(prover_instance->get_precomputed());
 
@@ -75,7 +74,7 @@ TEST_F(OinkTests, OinkProverIsDeterministic)
 TEST_F(OinkTests, OinkProverCommitments)
 {
     Builder circuit;
-    GoblinMockCircuits::construct_simple_circuit(circuit);
+    MegaCircuitTestHelper::construct_simple_circuit(circuit);
     auto prover_instance = std::make_shared<ProverInstance>(circuit);
     auto verification_key = std::make_shared<VerificationKey>(prover_instance->get_precomputed());
     auto vk_and_hash = std::make_shared<typename Flavor::VKAndHash>(verification_key);

barretenberg/cpp/src/barretenberg/ultra_honk/zk_boundary.test.cpp

@@ -13,9 +13,9 @@
  */
 #include <gtest/gtest.h>
 
-#include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/honk/relation_checker.hpp"
 #include "barretenberg/relations/ecc_op_queue_relation.hpp"
+#include "barretenberg/ultra_honk/mega_circuit_test_helper.hpp"
 #include "barretenberg/ultra_honk/oink_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
@@ -42,7 +42,7 @@ class ZKBoundaryTests : public ::testing::Test {
     static std::shared_ptr<ProverInstance> build_instance()
     {
         Builder builder;
-        GoblinMockCircuits::construct_simple_circuit(builder);
+        MegaCircuitTestHelper::construct_simple_circuit(builder);
         return std::make_shared<ProverInstance>(builder);
     }
 
@@ -207,7 +207,7 @@ TEST_F(ZKBoundaryTests, ProveAndVerifyMegaZK)
 TEST_F(ZKBoundaryTests, CorruptionInActiveRegionFailsProof)
 {
     Builder builder;
-    GoblinMockCircuits::construct_simple_circuit(builder);
+    MegaCircuitTestHelper::construct_simple_circuit(builder);
 
     // Build two instances from the same circuit
     auto builder_copy = builder;