From 3ec540f1ddaa52cfb29b61c3a95fe839137ef405 Mon Sep 17 00:00:00 2001
From: Tom French <tom@tomfren.ch>
Date: Tue, 12 Sep 2023 10:19:19 +0100
Subject: [PATCH] chore: refactor `execute_cmd`

---
 tooling/nargo_cli/src/cli/execute_cmd.rs | 36 +++++++++---------------
 tooling/nargo_cli/src/cli/prove_cmd.rs   |  2 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/tooling/nargo_cli/src/cli/execute_cmd.rs b/tooling/nargo_cli/src/cli/execute_cmd.rs
index ccbc5d03776..872a86484da 100644
--- a/tooling/nargo_cli/src/cli/execute_cmd.rs
+++ b/tooling/nargo_cli/src/cli/execute_cmd.rs
@@ -1,7 +1,6 @@
-use acvm::acir::circuit::{Opcode, OpcodeLocation};
+use acvm::acir::circuit::OpcodeLocation;
 use acvm::acir::{circuit::Circuit, native_types::WitnessMap};
 use acvm::pwg::{ErrorLocation, OpcodeResolutionError};
-use acvm::Language;
 use clap::Args;
 use fm::FileManager;
 use nargo::constants::PROVER_INPUT_FILE;
@@ -52,25 +51,22 @@ pub(crate) fn run(
         if args.workspace { PackageSelection::All } else { PackageSelection::DefaultOrAll };
     let selection = args.package.map_or(default_selection, PackageSelection::Selected);
     let workspace = resolve_workspace_from_toml(&toml_path, selection)?;
-    let witness_dir = &workspace.target_directory_path();
+    let target_dir = &workspace.target_directory_path();
 
     let (np_language, is_opcode_supported) = backend.get_backend_info()?;
     for package in &workspace {
-        let (return_value, solved_witness) = execute_package(
-            backend,
-            package,
-            &args.prover_name,
-            &args.compile_options,
-            np_language,
-            &is_opcode_supported,
-        )?;
+        let (file_manager, compiled_program) =
+            compile_package(package, &args.compile_options, np_language, &is_opcode_supported)?;
+
+        let (return_value, solved_witness) =
+            execute_program_and_decode(compiled_program, file_manager, package, &args.prover_name)?;
 
         println!("[{}] Circuit witness successfully solved", package.name);
         if let Some(return_value) = return_value {
             println!("[{}] Circuit output: {return_value:?}", package.name);
         }
         if let Some(witness_name) = &args.witness_name {
-            let witness_path = save_witness_to_dir(solved_witness, witness_name, witness_dir)?;
+            let witness_path = save_witness_to_dir(solved_witness, witness_name, target_dir)?;
 
             println!("[{}] Witness saved to {}", package.name, witness_path.display());
         }
@@ -78,23 +74,18 @@ pub(crate) fn run(
     Ok(())
 }
 
-fn execute_package(
-    backend: &Backend,
+fn execute_program_and_decode(
+    program: CompiledProgram,
+    file_manager: FileManager,
     package: &Package,
     prover_name: &str,
-    compile_options: &CompileOptions,
-    np_language: Language,
-    is_opcode_supported: &impl Fn(&Opcode) -> bool,
 ) -> Result<(Option<InputValue>, WitnessMap), CliError> {
-    let (context, compiled_program) =
-        compile_package(package, compile_options, np_language, &is_opcode_supported)?;
-    let CompiledProgram { abi, circuit, debug } = compiled_program;
+    let CompiledProgram { abi, circuit, debug } = program;
 
     // Parse the initial witness values from Prover.toml
     let (inputs_map, _) =
         read_inputs_from_file(&package.root_dir, prover_name, Format::Toml, &abi)?;
-    let solved_witness =
-        execute_program(backend, circuit, &abi, &inputs_map, Some((debug, context)))?;
+    let solved_witness = execute_program(circuit, &abi, &inputs_map, Some((debug, file_manager)))?;
     let public_abi = abi.public_abi();
     let (_, return_value) = public_abi.decode(&solved_witness)?;
 
@@ -190,7 +181,6 @@ fn report_error_with_opcode_locations(
 }
 
 pub(crate) fn execute_program(
-    _backend: &Backend,
     circuit: Circuit,
     abi: &Abi,
     inputs_map: &InputMap,
diff --git a/tooling/nargo_cli/src/cli/prove_cmd.rs b/tooling/nargo_cli/src/cli/prove_cmd.rs
index 417a0872d0a..f3c377c1f26 100644
--- a/tooling/nargo_cli/src/cli/prove_cmd.rs
+++ b/tooling/nargo_cli/src/cli/prove_cmd.rs
@@ -117,7 +117,7 @@ pub(crate) fn prove_package(
     let (inputs_map, _) =
         read_inputs_from_file(&package.root_dir, prover_name, Format::Toml, &abi)?;
 
-    let solved_witness = execute_program(backend, bytecode.clone(), &abi, &inputs_map, debug_data)?;
+    let solved_witness = execute_program(bytecode.clone(), &abi, &inputs_map, debug_data)?;
 
     // Write public inputs into Verifier.toml
     let public_abi = abi.public_abi();