chore: cleanup phases in avm witgen (#10432)

AztecProtocol · Dec 9, 2024 · 715b4da · 715b4da
1 parent f11a293
commit 715b4da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp
@@ -326,18 +326,6 @@ std::vector<Row> Execution::gen_trace(AvmPublicInputs const& public_inputs,
         teardown_call_requests.push_back(public_inputs.public_teardown_call_request);
     }
 
-    // Temporary spot for private non-revertible insertion
-    std::vector<FF> siloed_nullifiers;
-    siloed_nullifiers.insert(siloed_nullifiers.end(),
-                             public_inputs.accumulated_data.nullifiers.begin(),
-                             public_inputs.accumulated_data.nullifiers.begin() +
-                                 public_inputs.previous_non_revertible_accumulated_data_array_lengths.nullifiers);
-    trace_builder.insert_private_state(siloed_nullifiers, {});
-    trace_builder.checkpoint_non_revertible_state();
-
-    std::array<PublicCallRequest, MAX_ENQUEUED_CALLS_PER_TX> public_teardown_call_requests{};
-    public_teardown_call_requests[0] = public_inputs.public_teardown_call_request;
-
     // Loop over all the public call requests
     uint8_t call_ctx = 0;
     const auto phases = { TxExecutionPhase::SETUP, TxExecutionPhase::APP_LOGIC, TxExecutionPhase::TEARDOWN };

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.hpp
@@ -47,6 +47,10 @@ class Execution {
                                           std::vector<FF>& returndata,
                                           bool check_bytecode_membership);
 
+    static AvmError execute_enqueued_call(AvmTraceBuilder& trace_builder,
+                                          PublicCallRequest& public_call_request,
+                                          std::vector<FF>& returndata);
+
     // For testing purposes only.
     static void set_trace_builder_constructor(TraceBuilderConstructor constructor)
     {