building but a bunch of old tests disabled

barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt

@@ -1,6 +1,5 @@
 # Each source represents a separate benchmark suite 
 set(BENCHMARK_SOURCES
-standard_honk.bench.cpp
 standard_plonk.bench.cpp
 ultra_honk.bench.cpp
 ultra_plonk.bench.cpp

barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp

@@ -1,6 +1,5 @@
 #include <benchmark/benchmark.h>
 
-#include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/proof_system/types/circuit_type.hpp"
 #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp"
@@ -195,20 +194,11 @@ void construct_proof_with_specified_num_gates(State& state,
         test_circuit_function(builder, num_gates);
 
         auto composer = Composer();
-        if constexpr (proof_system::IsAnyOf<Composer, proof_system::honk::StandardComposer>) {
-            auto instance = composer.create_instance(builder);
-            auto ext_prover = composer.create_prover(instance);
-            state.ResumeTiming();
-
-            // Construct proof
-            auto proof = ext_prover.construct_proof();
-        } else {
-            auto ext_prover = composer.create_prover(builder);
-            state.ResumeTiming();
+        auto ext_prover = composer.create_prover(builder);
+        state.ResumeTiming();
 
-            // Construct proof
-            auto proof = ext_prover.construct_proof();
-        }
+        // Construct proof
+        auto proof = ext_prover.construct_proof();
     }
 }
 

barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp

@@ -1,7 +1,5 @@
 #include "barretenberg/honk/flavor/goblin_ultra.hpp"
-#include "barretenberg/honk/flavor/standard.hpp"
 #include "barretenberg/honk/flavor/ultra.hpp"
-#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
@@ -47,12 +45,6 @@ template <typename Flavor, typename Relation> void execute_relation(::benchmark:
     }
 }
 
-void arithmetic_relation(::benchmark::State& state) noexcept
-{
-    execute_relation<honk::flavor::Standard, ArithmeticRelation<FF>>(state);
-}
-BENCHMARK(arithmetic_relation);
-
 void auxiliary_relation(::benchmark::State& state) noexcept
 {
     execute_relation<honk::flavor::Ultra, AuxiliaryRelation<FF>>(state);
@@ -83,11 +75,11 @@ void lookup_relation(::benchmark::State& state) noexcept
 }
 BENCHMARK(lookup_relation);
 
-void permutation_relation(::benchmark::State& state) noexcept
+void ultra_permutation_relation(::benchmark::State& state) noexcept
 {
-    execute_relation<honk::flavor::Standard, PermutationRelation<FF>>(state);
+    execute_relation<honk::flavor::Ultra, UltraPermutationRelation<FF>>(state);
 }
-BENCHMARK(permutation_relation);
+BENCHMARK(ultra_permutation_relation);
 
 void ultra_arithmetic_relation(::benchmark::State& state) noexcept
 {

barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.hpp

@@ -23,7 +23,7 @@ template <ECCVMFlavor Flavor> class ECCVMComposer_ {
     std::shared_ptr<VerificationKey> verification_key;
 
     // The crs_factory holds the path to the srs and exposes methods to extract the srs elements
-    std::shared_ptr<srs::factories::CrsFactory<typename Flavor::Curve>> crs_factory_;
+    std::shared_ptr<barretenberg::srs::factories::CrsFactory<typename Flavor::Curve>> crs_factory_;
 
     // The commitment key is passed to the prover but also used herein to compute the verfication key commitments
     std::shared_ptr<CommitmentKey> commitment_key;
@@ -42,7 +42,8 @@ template <ECCVMFlavor Flavor> class ECCVMComposer_ {
         crs_factory_ = barretenberg::srs::get_crs_factory();
     };
 
-    explicit ECCVMComposer_(std::shared_ptr<srs::factories::CrsFactory<typename Flavor::Curve>> crs_factory)
+    explicit ECCVMComposer_(
+        std::shared_ptr<barretenberg::srs::factories::CrsFactory<typename Flavor::Curve>> crs_factory)
         : crs_factory_(std::move(crs_factory))
     {}
 
@@ -65,7 +66,7 @@ template <ECCVMFlavor Flavor> class ECCVMComposer_ {
     ECCVMProver_<Flavor> create_prover(CircuitConstructor& circuit_constructor);
     ECCVMVerifier_<Flavor> create_verifier(CircuitConstructor& circuit_constructor);
 
-    void add_table_column_selector_poly_to_proving_key(polynomial& small, const std::string& tag);
+    void add_table_column_selector_poly_to_proving_key(barretenberg::polynomial& small, const std::string& tag);
 
     void compute_commitment_key(size_t circuit_size)
     {

barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp

@@ -4,7 +4,6 @@
 #include <vector>
 
 #include "barretenberg/honk/composer/eccvm_composer.hpp"
-#include "barretenberg/honk/proof_system/prover.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_round.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"