From 85a7a38d29ab97aaca34261540ecfc047abba8c0 Mon Sep 17 00:00:00 2001 From: Jaremy Creechley Date: Fri, 22 Dec 2023 19:13:45 -0700 Subject: [PATCH] update init to remove redundant pointers --- codex_proofs_ffi.nim | 4 +--- src/ffi.rs | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/codex_proofs_ffi.nim b/codex_proofs_ffi.nim index 279a261..7e791c5 100644 --- a/codex_proofs_ffi.nim +++ b/codex_proofs_ffi.nim @@ -26,9 +26,7 @@ proc free_prover*(prover: ptr StorageProofs) {.importc: "free_prover".} ## # Safety # # Construct a StorageProofs object -proc init*(r1cs: ptr (ptr Buffer), - wasm: ptr (ptr Buffer), - zkey: ptr (ptr Buffer)): (ptr StorageProofs) {.importc: "init".} +proc init*(r1cs: Buffer, wasm: Buffer, zkey: ptr Buffer): (ptr StorageProofs) {.importc: "init".} ## # Safety # diff --git a/src/ffi.rs b/src/ffi.rs index 44599c7..23f060d 100644 --- a/src/ffi.rs +++ b/src/ffi.rs @@ -36,7 +36,7 @@ impl ProofCtx { /// /// Construct a StorageProofs object #[no_mangle] -pub unsafe extern "C" fn init( +pub unsafe extern "C" fn init_proof_ctx( r1cs: Buffer, wasm: Buffer, zkey: *const Buffer, @@ -215,7 +215,7 @@ mod tests { circuit_tests::utils::{digest, treehash}, storage_proofs::EXT_ID_U256_LE, ffi::prove_mpack_ext }; - use super::{init, prove, Buffer}; + use super::{init_proof_ctx, prove, Buffer}; use rmpv::Value; use rmpv::encode::write_value; @@ -389,7 +389,7 @@ mod tests { len: wasm_path.len(), }; - let prover_ptr = unsafe { init(r1cs, wasm, std::ptr::null()) }; + let prover_ptr = unsafe { init_proof_ctx(r1cs, wasm, std::ptr::null()) }; let prove_ctx: *mut crate::ffi::ProofCtx = unsafe { prove_mpack_ext( prover_ptr, @@ -487,7 +487,7 @@ mod tests { len: wasm_path.len(), }; - let prover_ptr = unsafe { init(r1cs, wasm, std::ptr::null()) }; + let prover_ptr = unsafe { init_proof_ctx(r1cs, wasm, std::ptr::null()) }; let prove_ctx: *mut crate::ffi::ProofCtx = unsafe { prove( prover_ptr,