napi: fix compilation of gate_vector

Author: querolita

plonk-napi/src/gate_vector.rs

@@ -141,12 +141,12 @@ macro_rules! impl_gate_support {
             #[napi]
             #[derive(Clone, Default, Debug)]
             pub struct [<Napi $module:camel GateVector>](
-                #[napi(skip)] pub Vec<CircuitGate<$field>>);
-
+                #[napi(skip)] pub Vec<CircuitGate<$field>>,
+            );
 
             #[napi]
             pub fn [<caml_pasta_ $module:snake _plonk_gate_vector_create>]() -> [<Napi $module:camel GateVector>] {
-                [<Napi $module:camel GateVector>(Vec::new())]
+                [<Napi $module:camel GateVector>](Vec::new())
             }
 
             #[napi]
@@ -188,10 +188,11 @@ macro_rules! impl_gate_support {
             pub fn [<caml_pasta_ $module:snake _plonk_gate_vector_digest>](
                 public_input_size: i32,
                 vector: &[<Napi $module:camel GateVector>],
-            ) -> Vec<u8> {
-                Circuit::new(public_input_size as usize, &vector.0)
+            ) -> Uint8Array {
+                let bytes = Circuit::new(public_input_size as usize, &vector.0)
                     .digest()
-                    .to_vec()
+                    .to_vec();
+                Uint8Array::from(bytes)
             }
 
             #[napi]
@@ -211,11 +212,5 @@ macro_rules! impl_gate_support {
     };
 }
 
-pub mod fp {
-    use super::*;
-    impl_gate_support!(fp, Fp, WasmPastaFp);
-}
-pub mod fq {
-    use super::*;
-    impl_gate_support!(fq, Fq, WasmPastaFq);
-}
+impl_gate_support!(fp, Fp, WasmPastaFp);
+impl_gate_support!(fq, Fq, WasmPastaFq);

plonk-napi/src/lib.rs

@@ -7,20 +7,15 @@ pub(crate) mod wrappers;
 pub use poseidon::{caml_pasta_fp_poseidon_block_cipher, caml_pasta_fq_poseidon_block_cipher};
 
 pub use gate_vector::{
-    fp::{
-        caml_pasta_fp_plonk_circuit_digest, caml_pasta_fp_plonk_circuit_serialize,
-        caml_pasta_fp_plonk_gate_vector_add, caml_pasta_fp_plonk_gate_vector_create,
-        caml_pasta_fp_plonk_gate_vector_digest, caml_pasta_fp_plonk_gate_vector_get,
-        caml_pasta_fp_plonk_gate_vector_len, caml_pasta_fp_plonk_gate_vector_wrap,
-        NapiFpGate as WasmFpGate, NapiFpGateVector as WasmFpGateVector,
-    },
-    fq::{
-        caml_pasta_fq_plonk_circuit_digest, caml_pasta_fq_plonk_circuit_serialize,
-        caml_pasta_fq_plonk_gate_vector_add, caml_pasta_fq_plonk_gate_vector_create,
-        caml_pasta_fq_plonk_gate_vector_digest, caml_pasta_fq_plonk_gate_vector_get,
-        caml_pasta_fq_plonk_gate_vector_len, caml_pasta_fq_plonk_gate_vector_wrap,
-        NapiFqGate as WasmFqGate, NapiFqGateVector as WasmFqGateVector,
-    },
+    caml_pasta_fp_plonk_circuit_serialize, caml_pasta_fp_plonk_gate_vector_add,
+    caml_pasta_fp_plonk_gate_vector_create, caml_pasta_fp_plonk_gate_vector_digest,
+    caml_pasta_fp_plonk_gate_vector_get, caml_pasta_fp_plonk_gate_vector_len,
+    caml_pasta_fp_plonk_gate_vector_wrap, caml_pasta_fq_plonk_circuit_serialize,
+    caml_pasta_fq_plonk_gate_vector_add, caml_pasta_fq_plonk_gate_vector_create,
+    caml_pasta_fq_plonk_gate_vector_digest, caml_pasta_fq_plonk_gate_vector_get,
+    caml_pasta_fq_plonk_gate_vector_len, caml_pasta_fq_plonk_gate_vector_wrap,
+    NapiFpGate as WasmFpGate, NapiFpGateVector as WasmFpGateVector, NapiFqGate as WasmFqGate,
+    NapiFqGateVector as WasmFqGateVector,
 };
 pub use poly_comm::{pallas::WasmFqPolyComm, vesta::WasmFpPolyComm};
 pub use wasm_vector::{fp::WasmVecVecFp, fq::WasmVecVecFq};