fix: Fix acvm wasm code

noir-lang · Oct 2, 2023 · 066de05 · 066de05
1 parent d16ee47
commit 066de05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/acvm-repo/acvm_js/src/foreign_call/inputs.rs b/acvm-repo/acvm_js/src/foreign_call/inputs.rs
@@ -1,12 +1,14 @@
-use acvm::brillig_vm::brillig::Value;
+use acvm::brillig_vm::brillig::ForeignCallParam;
 
 use crate::js_witness_map::field_element_to_js_string;
 
-pub(super) fn encode_foreign_call_inputs(foreign_call_inputs: &[Vec<Value>]) -> js_sys::Array {
+pub(super) fn encode_foreign_call_inputs(
+    foreign_call_inputs: &[ForeignCallParam],
+) -> js_sys::Array {
     let inputs = js_sys::Array::default();
     for input in foreign_call_inputs {
         let input_array = js_sys::Array::default();
-        for value in input {
+        for value in input.values() {
             let hex_js_string = field_element_to_js_string(&value.to_field());
             input_array.push(&hex_js_string);
         }

diff --git a/acvm-repo/acvm_js/src/foreign_call/outputs.rs b/acvm-repo/acvm_js/src/foreign_call/outputs.rs
@@ -1,20 +1,20 @@
-use acvm::brillig_vm::brillig::{ForeignCallOutput, ForeignCallResult, Value};
+use acvm::brillig_vm::brillig::{ForeignCallParam, ForeignCallResult, Value};
 use wasm_bindgen::JsValue;
 
 use crate::js_witness_map::js_value_to_field_element;
 
-fn decode_foreign_call_output(output: JsValue) -> Result<ForeignCallOutput, String> {
+fn decode_foreign_call_output(output: JsValue) -> Result<ForeignCallParam, String> {
     if output.is_string() {
         let value = Value::from(js_value_to_field_element(output)?);
-        Ok(ForeignCallOutput::Single(value))
+        Ok(ForeignCallParam::Single(value))
     } else if output.is_array() {
         let output = js_sys::Array::from(&output);
 
         let mut values: Vec<Value> = Vec::with_capacity(output.length() as usize);
         for elem in output.iter() {
-            values.push(Value::from(js_value_to_field_element(elem)?))
+            values.push(Value::from(js_value_to_field_element(elem)?));
         }
-        Ok(ForeignCallOutput::Array(values))
+        Ok(ForeignCallParam::Array(values))
     } else {
         return Err("Non-string-or-array element in foreign_call_handler return".into());
     }
@@ -23,7 +23,7 @@ fn decode_foreign_call_output(output: JsValue) -> Result<ForeignCallOutput, Stri
 pub(super) fn decode_foreign_call_result(
     js_array: js_sys::Array,
 ) -> Result<ForeignCallResult, String> {
-    let mut values: Vec<ForeignCallOutput> = Vec::with_capacity(js_array.length() as usize);
+    let mut values: Vec<ForeignCallParam> = Vec::with_capacity(js_array.length() as usize);
     for elem in js_array.iter() {
         values.push(decode_foreign_call_output(elem)?);
     }