Revert "Try just Ultra"

This reverts commit 6b95005.
AztecProtocol · Dec 12, 2023 · 7999299 · 7999299
1 parent 6b95005
commit 7999299
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp
@@ -60,7 +60,7 @@ std::vector<uint8_t> AcirComposer::create_proof(acir_format::acir_format& constr
     create_circuit_with_witness(builder_, constraint_system, witness);
     info("gates: ", builder_.get_total_circuit_size());
 
-    // info("create_proof: ULTRA OPS SIZE = ", builder_.op_queue->ultra_ops.size());
+    info("create_proof: ULTRA OPS SIZE = ", builder_.op_queue->ultra_ops.size());
 
     // WORKTODO: accumulate creates an instance and a pk, ignoring this one.
     goblin = [&]() {

diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp
@@ -13,7 +13,7 @@ namespace acir_proofs {
  */
 class AcirComposer {
   public:
-    using Flavor = proof_system::honk::flavor::Ultra;
+    using Flavor = proof_system::honk::flavor::GoblinUltra;
     // WORKTODO: it would be nice if we could just flip the flavor
     // using Flavor = plonk::flavor::Ultra;
     using ProvingKey = typename Flavor::ProvingKey;

diff --git a/barretenberg/cpp/src/barretenberg/dsl/types.hpp b/barretenberg/cpp/src/barretenberg/dsl/types.hpp
@@ -23,13 +23,13 @@
 
 namespace acir_format {
 
-using Builder = proof_system::UltraCircuitBuilder;
+using Builder = proof_system::GoblinUltraCircuitBuilder;
 
-using Composer = proof_system::honk::UltraComposer;
+using Composer = proof_system::honk::GoblinUltraComposer;
 
-using Prover = proof_system::honk::UltraProver;
+using Prover = proof_system::honk::GoblinUltraProver;
 
-using Verifier = proof_system::honk::UltraVerifier;
+using Verifier = proof_system::honk::GoblinUltraVerifier;
 
 using RecursiveProver = Prover;
 

diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp
@@ -13,7 +13,7 @@ namespace barretenberg {
 
 class Goblin {
     using HonkProof = proof_system::plonk::proof;
-    using GUHFlavor = proof_system::honk::flavor::Ultra;
+    using GUHFlavor = proof_system::honk::flavor::GoblinUltra;
     using GUHProvingKey = GUHFlavor::ProvingKey;
     using GUHVerificationKey = GUHFlavor::VerificationKey;
     using Commitment = GUHFlavor::Commitment;
@@ -57,10 +57,10 @@ class Goblin {
     using Fq = barretenberg::fq;
 
     using Transcript = proof_system::honk::BaseTranscript;
-    using GoblinUltraComposer = proof_system::honk::UltraComposer;
+    using GoblinUltraComposer = proof_system::honk::GoblinUltraComposer;
     // LEFTOFF: create an Instance member
     using GoblinUltraVerifier = proof_system::honk::UltraVerifier_<GUHFlavor>;
-    using GoblinUltraCircuitBuilder = proof_system::UltraCircuitBuilder;
+    using GoblinUltraCircuitBuilder = proof_system::GoblinUltraCircuitBuilder;
     using OpQueue = proof_system::ECCOpQueue;
     using ECCVMFlavor = proof_system::honk::flavor::ECCVM;
     using ECCVMBuilder = proof_system::ECCVMCircuitBuilder<ECCVMFlavor>;

diff --git a/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp b/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp
@@ -83,6 +83,5 @@ std::array<typename bn254<CircuitBuilder>::Element, 2> MergeRecursiveVerifier_<C
 }
 
 template class MergeRecursiveVerifier_<GoblinUltraCircuitBuilder>;
-template class MergeRecursiveVerifier_<UltraCircuitBuilder>;
 
 } // namespace proof_system::plonk::stdlib::recursion::goblin
diff --git a/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp b/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp
@@ -27,6 +27,5 @@ template <typename CircuitBuilder> class MergeRecursiveVerifier_ {
 };
 
 extern template class MergeRecursiveVerifier_<GoblinUltraCircuitBuilder>;
-extern template class MergeRecursiveVerifier_<UltraCircuitBuilder>;
 
 } // namespace proof_system::plonk::stdlib::recursion::goblin