fix after merge

AztecProtocol · May 24, 2024 · d70f4ab · d70f4ab
1 parent 4e1d6e4
commit d70f4ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_impl.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_impl.hpp
@@ -208,13 +208,4 @@ FoldingResult<typename ProverInstances::Flavor> ProtoGalaxyProver_<ProverInstanc
 
     return state.result;
 }
-
-template class ProtoGalaxyProver_<ProverInstances_<UltraFlavor, 2>>;
-template class ProtoGalaxyProver_<ProverInstances_<MegaFlavor, 2>>;
-
-template class ProtoGalaxyProver_<ProverInstances_<UltraFlavor, 3>>;
-template class ProtoGalaxyProver_<ProverInstances_<MegaFlavor, 3>>;
-
-template class ProtoGalaxyProver_<ProverInstances_<UltraFlavor, 4>>;
-template class ProtoGalaxyProver_<ProverInstances_<MegaFlavor, 4>>;
 } // namespace bb
diff --git a/...alaxy/protogalaxy_prover_goblin_ultra.cpp → ...g/protogalaxy/protogalaxy_prover_mega.cpp b/...alaxy/protogalaxy_prover_goblin_ultra.cpp → ...g/protogalaxy/protogalaxy_prover_mega.cpp
@@ -4,7 +4,7 @@
 #include "protogalaxy_prover_impl.hpp"
 namespace bb {
 
-template class ProtoGalaxyProver_<ProverInstances_<GoblinUltraFlavor, 2>>;
-template class ProtoGalaxyProver_<ProverInstances_<GoblinUltraFlavor, 3>>;
-template class ProtoGalaxyProver_<ProverInstances_<GoblinUltraFlavor, 4>>;
+template class ProtoGalaxyProver_<ProverInstances_<MegaFlavor, 2>>;
+template class ProtoGalaxyProver_<ProverInstances_<MegaFlavor, 3>>;
+template class ProtoGalaxyProver_<ProverInstances_<MegaFlavor, 4>>;
 } // namespace bb
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.test.cpp
@@ -6,13 +6,15 @@
 #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
 #include "databus.hpp"
 
+using namespace bb;
+
 using Builder = MegaCircuitBuilder;
 using field_ct = stdlib::field_t<Builder>;
 using witness_ct = stdlib::witness_t<Builder>;
 using databus_ct = stdlib::databus<Builder>;
 
 namespace {
-auto& engine = numeric::get_debug_randomness();
+auto& engine = bb::numeric::get_debug_randomness();
 }
 
 /**