update init to remove redundant pointers

This commit is contained in:
Jaremy Creechley 2023-12-22 19:13:45 -07:00
parent 951ca3fa0e
commit 85a7a38d29
No known key found for this signature in database
GPG Key ID: 4E66FB67B21D3300
2 changed files with 5 additions and 7 deletions

View File

@ -26,9 +26,7 @@ proc free_prover*(prover: ptr StorageProofs) {.importc: "free_prover".}
## # Safety ## # Safety
# #
# Construct a StorageProofs object # Construct a StorageProofs object
proc init*(r1cs: ptr (ptr Buffer), proc init*(r1cs: Buffer, wasm: Buffer, zkey: ptr Buffer): (ptr StorageProofs) {.importc: "init".}
wasm: ptr (ptr Buffer),
zkey: ptr (ptr Buffer)): (ptr StorageProofs) {.importc: "init".}
## # Safety ## # Safety
# #

View File

@ -36,7 +36,7 @@ impl ProofCtx {
/// ///
/// Construct a StorageProofs object /// Construct a StorageProofs object
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn init( pub unsafe extern "C" fn init_proof_ctx(
r1cs: Buffer, r1cs: Buffer,
wasm: Buffer, wasm: Buffer,
zkey: *const 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 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::Value;
use rmpv::encode::write_value; use rmpv::encode::write_value;
@ -389,7 +389,7 @@ mod tests {
len: wasm_path.len(), 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 { let prove_ctx: *mut crate::ffi::ProofCtx = unsafe {
prove_mpack_ext( prove_mpack_ext(
prover_ptr, prover_ptr,
@ -487,7 +487,7 @@ mod tests {
len: wasm_path.len(), 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 { let prove_ctx: *mut crate::ffi::ProofCtx = unsafe {
prove( prove(
prover_ptr, prover_ptr,