refactor: separate ffis from code

refactor: rename libraries

Author: JuArce

crates/batcher/build.rs

@@ -1,6 +1,6 @@
 use std::{env, path::PathBuf, process::Command};
 
-const GO_SRC: &str = "./verifiers_ffi/verifier.go";
+const GO_SRC: &str = "./go_verifiers_lib/verifier.go";
 const GO_OUT: &str = "libverifier.a";
 const GO_LIB: &str = "verifier";
 

crates/batcher/verifiers_ffi/go.mod crates/batcher/go_verifiers_lib/go.modcrates/batcher/verifiers_ffi/go.mod renamed to crates/batcher/go_verifiers_lib/go.mod

@@ -1,31 +1,5 @@
 use aligned_sdk::common::types::ProvingSystemId;
-
-#[derive(Copy, Clone, Debug)]
-#[repr(C)]
-pub struct ListRef {
-    data: *const u8,
-    len: usize,
-}
-
-impl From<Vec<u8>> for ListRef {
-    fn from(v: Vec<u8>) -> Self {
-        Self::from(v.as_slice())
-    }
-}
-
-impl From<&Vec<u8>> for ListRef {
-    fn from(v: &Vec<u8>) -> Self {
-        Self::from(v.as_slice())
-    }
-}
-
-impl From<&[u8]> for ListRef {
-    fn from(v: &[u8]) -> Self {
-        let len = v.len();
-        let data = v.as_ptr().cast();
-        ListRef { data, len }
-    }
-}
+use crate::ffi::circom_ffi::VerifyCircomGroth16ProofBN128;
 
 pub fn verify_circom(
     proving_system: &ProvingSystemId,
@@ -44,11 +18,3 @@ pub fn verify_circom(
         _ => false,
     }
 }
-
-extern "C" {
-    pub fn VerifyCircomGroth16ProofBN128(
-        proof: ListRef,
-        public_input: ListRef,
-        verification_key: ListRef,
-    ) -> bool;
-}

crates/batcher/verifiers_ffi/go.sum crates/batcher/go_verifiers_lib/go.sumcrates/batcher/verifiers_ffi/go.sum renamed to crates/batcher/go_verifiers_lib/go.sum

@@ -0,0 +1,9 @@
+use crate::ffi::list_ref::ListRef;
+
+extern "C" {
+    pub fn VerifyCircomGroth16ProofBN128(
+        proof: ListRef,
+        public_input: ListRef,
+        verification_key: ListRef,
+    ) -> bool;
+}

crates/batcher/verifiers_ffi/verifier.go …tes/batcher/go_verifiers_lib/verifier.gocrates/batcher/verifiers_ffi/verifier.go renamed to crates/batcher/go_verifiers_lib/verifier.go crates/batcher/verifiers_ffi/verifier.go renamed to crates/batcher/go_verifiers_lib/verifier.go

@@ -0,0 +1,19 @@
+use crate::ffi::list_ref::ListRef;
+
+extern "C" {
+    pub fn VerifyPlonkProofBLS12_381(
+        proof: ListRef,
+        public_input: ListRef,
+        verification_key: ListRef,
+    ) -> bool;
+    pub fn VerifyPlonkProofBN254(
+        proof: ListRef,
+        public_input: ListRef,
+        verification_key: ListRef,
+    ) -> bool;
+    pub fn VerifyGroth16ProofBN254(
+        proof: ListRef,
+        public_input: ListRef,
+        verification_key: ListRef,
+    ) -> bool;
+}

crates/batcher/src/circom/verifier.rs

@@ -0,0 +1,26 @@
+#[derive(Copy, Clone, Debug)]
+#[repr(C)]
+pub struct ListRef {
+    data: *const u8,
+    len: usize,
+}
+
+impl From<Vec<u8>> for ListRef {
+    fn from(v: Vec<u8>) -> Self {
+        Self::from(v.as_slice())
+    }
+}
+
+impl From<&Vec<u8>> for ListRef {
+    fn from(v: &Vec<u8>) -> Self {
+        Self::from(v.as_slice())
+    }
+}
+
+impl From<&[u8]> for ListRef {
+    fn from(v: &[u8]) -> Self {
+        let len = v.len();
+        let data = v.as_ptr().cast();
+        ListRef { data, len }
+    }
+}

crates/batcher/src/ffi/circom_ffi.rs

@@ -0,0 +1,3 @@
+mod list_ref;
+pub mod circom_ffi;
+pub mod gnark_ffi;

crates/batcher/src/ffi/gnark_ffi.rs

@@ -1,31 +1,5 @@
 use aligned_sdk::common::types::ProvingSystemId;
-
-#[derive(Copy, Clone, Debug)]
-#[repr(C)]
-pub struct ListRef {
-    data: *const u8,
-    len: usize,
-}
-
-impl From<Vec<u8>> for ListRef {
-    fn from(v: Vec<u8>) -> Self {
-        Self::from(v.as_slice())
-    }
-}
-
-impl From<&Vec<u8>> for ListRef {
-    fn from(v: &Vec<u8>) -> Self {
-        Self::from(v.as_slice())
-    }
-}
-
-impl From<&[u8]> for ListRef {
-    fn from(v: &[u8]) -> Self {
-        let len = v.len();
-        let data = v.as_ptr().cast();
-        ListRef { data, len }
-    }
-}
+use crate::ffi::gnark_ffi::{VerifyGroth16ProofBN254, VerifyPlonkProofBLS12_381, VerifyPlonkProofBN254};
 
 pub fn verify_gnark(
     proving_system: &ProvingSystemId,
@@ -50,21 +24,3 @@ pub fn verify_gnark(
         _ => false,
     }
 }
-
-extern "C" {
-    pub fn VerifyPlonkProofBLS12_381(
-        proof: ListRef,
-        public_input: ListRef,
-        verification_key: ListRef,
-    ) -> bool;
-    pub fn VerifyPlonkProofBN254(
-        proof: ListRef,
-        public_input: ListRef,
-        verification_key: ListRef,
-    ) -> bool;
-    pub fn VerifyGroth16ProofBN254(
-        proof: ListRef,
-        public_input: ListRef,
-        verification_key: ListRef,
-    ) -> bool;
-}