From fe13bc125fcf8e18c47f6d8e3f76f25ba867c97c Mon Sep 17 00:00:00 2001
From: maramihali <mara@aztecprotocol.com>
Date: Tue, 20 Feb 2024 11:43:53 +0000
Subject: [PATCH] typos + make gcc pass

---
 .../barretenberg/benchmark/ivc_bench/ivc.bench.cpp   | 12 ++++++------
 .../client_ivc/mock_kernel_pinning.test.cpp          |  2 +-
 .../src/barretenberg/ultra_honk/ultra_composer.cpp   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp
index 366fbce42ae0..8a474b653ffa 100644
--- a/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp
+++ b/barretenberg/cpp/src/barretenberg/benchmark/ivc_bench/ivc.bench.cpp
@@ -48,8 +48,8 @@ class IvcBench : public benchmark::Fixture {
         Builder initial_function_circuit{ ivc.goblin.op_queue };
         GoblinMockCircuits::construct_mock_function_circuit(initial_function_circuit);
         ivc.initialize(initial_function_circuit);
-        auto kernel_verifeir_accumulator = std::make_shared<ClientIVC::VerifierInstance>();
-        kernel_verifeir_accumulator->verification_key = ivc.vks.first_func_vk;
+        auto kernel_verifier_accumulator = std::make_shared<ClientIVC::VerifierInstance>();
+        kernel_verifier_accumulator->verification_key = ivc.vks.first_func_vk;
 
         // Accumulate another function circuit
         Builder function_circuit{ ivc.goblin.op_queue };
@@ -59,8 +59,8 @@ class IvcBench : public benchmark::Fixture {
 
         // Create and accumulate the first folding kernel which only verifies the accumulation of a function circuit
         Builder kernel_circuit{ ivc.goblin.op_queue };
-        kernel_verifeir_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
-            kernel_circuit, function_fold_output, {}, kernel_verifeir_accumulator);
+        kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
+            kernel_circuit, function_fold_output, {}, kernel_verifier_accumulator);
         auto kernel_fold_proof = ivc.accumulate(kernel_circuit);
         FoldOutput kernel_fold_output = { kernel_fold_proof, ivc.vks.first_kernel_vk };
 
@@ -77,8 +77,8 @@ class IvcBench : public benchmark::Fixture {
             // Create kernel circuit containing the recursive folding verification of a function circuit and a kernel
             // circuit and accumulate it
             Builder kernel_circuit{ ivc.goblin.op_queue };
-            kernel_verifeir_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
-                kernel_circuit, function_fold_output, kernel_fold_output, kernel_verifeir_accumulator);
+            kernel_verifier_accumulator = GoblinMockCircuits::construct_mock_folding_kernel(
+                kernel_circuit, function_fold_output, kernel_fold_output, kernel_verifier_accumulator);
 
             kernel_fold_proof = ivc.accumulate(kernel_circuit);
             kernel_fold_output = { kernel_fold_proof, ivc.vks.kernel_vk };
diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
index 5011d1753913..ba4c706a8540 100644
--- a/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/client_ivc/mock_kernel_pinning.test.cpp
@@ -21,7 +21,7 @@ TEST_F(MockKernelTest, PinFoldingKernelSizes)
     using FoldOutput = GoblinMockCircuits::FoldOutput;
     ClientIVC ivc;
     ivc.precompute_folding_verification_keys();
-    // Accumulate three circuits to generate two folding proofs for input to foldng kernel
+    // Accumulate three circuits to generate two folding proofs for input to folding kernel
     GoblinUltraCircuitBuilder circuit_1{ ivc.goblin.op_queue };
     GoblinMockCircuits::construct_mock_function_circuit(circuit_1);
     ivc.initialize(circuit_1);
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
index b745f001c5ba..1ed884e8830f 100644
--- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
+++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp
@@ -58,7 +58,7 @@ std::shared_ptr<typename Flavor::VerificationKey> UltraComposer_<Flavor>::comput
         verification_key->q_poseidon2_internal = commitment_key->commit(proving_key->q_poseidon2_internal);
     }
 
-    return std::move(verification_key);
+    return verification_key;
 }
 
 template <IsUltraFlavor Flavor>