chore: remove abi decoding from execute_program (#868)

* chore: remove abi decoding from `execute_program`

* chore: clippy

crates/nargo/src/cli/compile_cmd.rs

@@ -67,8 +67,7 @@ pub fn generate_circuit_and_witness_to_disk<P: AsRef<Path>>(
             &compiled_program.abi,
         )?;
 
-        let (_, solved_witness) =
-            super::execute_cmd::execute_program(&compiled_program, &inputs_map)?;
+        let solved_witness = super::execute_cmd::execute_program(&compiled_program, &inputs_map)?;
 
         circuit_path.pop();
         save_witness_to_dir(solved_witness, circuit_name, &circuit_path)?;

crates/nargo/src/cli/execute_cmd.rs

@@ -64,28 +64,20 @@ fn execute_with_path<P: AsRef<Path>>(
         &compiled_program.abi,
     )?;
 
-    execute_program(&compiled_program, &inputs_map)
-}
-
-pub(crate) fn execute_program(
-    compiled_program: &CompiledProgram,
-    inputs_map: &InputMap,
-) -> Result<(Option<InputValue>, WitnessMap), CliError> {
-    // Solve the remaining witnesses
-    let solved_witness = solve_witness(compiled_program, inputs_map)?;
+    let solved_witness = execute_program(&compiled_program, &inputs_map)?;
 
-    let public_abi = compiled_program.abi.clone().public_abi();
+    let public_abi = compiled_program.abi.public_abi();
     let public_inputs = public_abi.decode(&solved_witness)?;
     let return_value = public_inputs.get(MAIN_RETURN_NAME).cloned();
 
     Ok((return_value, solved_witness))
 }
 
-pub(crate) fn solve_witness(
+pub(crate) fn execute_program(
     compiled_program: &CompiledProgram,
-    input_map: &InputMap,
+    inputs_map: &InputMap,
 ) -> Result<WitnessMap, CliError> {
-    let mut solved_witness = compiled_program.abi.encode(input_map, true)?;
+    let mut solved_witness = compiled_program.abi.encode(inputs_map, true)?;
 
     let backend = crate::backends::ConcreteBackend;
     backend.solve(&mut solved_witness, compiled_program.circuit.opcodes.clone())?;

crates/nargo/src/cli/prove_cmd.rs

@@ -88,7 +88,7 @@ pub fn prove_with_path<P: AsRef<Path>>(
         &compiled_program.abi,
     )?;
 
-    let (_, solved_witness) = execute_program(&compiled_program, &inputs_map)?;
+    let solved_witness = execute_program(&compiled_program, &inputs_map)?;
 
     // Write public inputs into Verifier.toml
     let public_abi = compiled_program.abi.clone().public_abi();