From efd306ad455c32bf6bf42bcc2f39f186588a26c4 Mon Sep 17 00:00:00 2001 From: Cody Date: Thu, 21 Nov 2024 16:34:17 +0000 Subject: [PATCH] Delete WORKTODOs --- barretenberg/cpp/src/barretenberg/bb/main.cpp | 1 - .../dsl/acir_format/ivc_recursion_constraint.test.cpp | 2 +- .../execution_trace/mega_execution_trace.hpp | 7 ------- .../stdlib_circuit_builders/circuit_simulator.hpp | 5 ++--- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp index 593a38c5597..12884597ab3 100644 --- a/barretenberg/cpp/src/barretenberg/bb/main.cpp +++ b/barretenberg/cpp/src/barretenberg/bb/main.cpp @@ -129,7 +129,6 @@ std::string vk_to_json(std::vector const& data) return format("[", join(map(rotated, [](auto fr) { return format("\"", fr, "\""); })), "]"); } -// WORKTODO: delete? std::string honk_vk_to_json(std::vector& data) { return format("[", join(map(data, [](auto fr) { return format("\"", fr, "\""); })), "]"); diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ivc_recursion_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ivc_recursion_constraint.test.cpp index 94ada7d9950..cdbd234948d 100644 --- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/ivc_recursion_constraint.test.cpp +++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ivc_recursion_constraint.test.cpp @@ -213,7 +213,7 @@ TEST_F(IvcRecursionConstraintTest, GenerateVK) // Construct kernel consisting only of the kernel completion logic AcirProgram program = construct_mock_kernel_program(ivc.verification_queue, { num_app_public_inputs }); Builder kernel = acir_format::create_kernel_circuit(program.constraints, ivc); - // WORKTODO: this would normally happen in accumulate() + // Note that this would normally happen in accumulate() kernel.add_pairing_point_accumulator(stdlib::recursion::init_default_agg_obj_indices(kernel)); auto proving_key = std::make_shared>(kernel, trace_settings); diff --git a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp index 26edf196c2d..44d6dce4945 100644 --- a/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp +++ b/barretenberg/cpp/src/barretenberg/plonk_honk_shared/execution_trace/mega_execution_trace.hpp @@ -190,13 +190,6 @@ class MegaExecutionTraceBlocks : public MegaTraceBlockData { this->overflow.fixed_size = settings.overflow_capacity; } - // WORKTODO: use or remove - MegaExecutionTraceBlocks(const TraceSettings& settings) - : MegaExecutionTraceBlocks() - { - set_fixed_block_sizes(settings); - } - void compute_offsets(bool is_structured) { uint32_t offset = 1; // start at 1 because the 0th row is unused for selectors for Honk diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp index 017c04e8d0d..14c55eac6b2 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_simulator.hpp @@ -47,9 +47,8 @@ class CircuitSimulatorBN254 { static constexpr size_t UINT_LOG2_BASE = 2; // Would be 6 for UltraPlonk static constexpr size_t DEFAULT_PLOOKUP_RANGE_BITNUM = 1028; - static constexpr size_t num_gates = 0; // WORKTODO: it was dumb to make this static. - // Should agree with what is in circuit builders - static constexpr uint32_t zero_idx = 0; // Ditto? + size_t num_gates = 0; + static constexpr uint32_t zero_idx = 0; // Should agree with what is in circuit builders std::vector public_inputs; void add_pairing_point_accumulator(const PairingPointAccumulatorIndices& proof_element_limbs)