From 0aeab04c704c43f1f2bbf05fb9b6e00eb182471a Mon Sep 17 00:00:00 2001 From: Luke Parker Date: Fri, 13 May 2022 20:26:53 -0400 Subject: [PATCH] Move Rust definitions of C functions to their respective files --- coins/monero/src/bulletproofs.rs | 14 +++++++++++++- coins/monero/src/lib.rs | 6 ------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/coins/monero/src/bulletproofs.rs b/coins/monero/src/bulletproofs.rs index 789d6a35..693a7b0f 100644 --- a/coins/monero/src/bulletproofs.rs +++ b/coins/monero/src/bulletproofs.rs @@ -2,7 +2,19 @@ use curve25519_dalek::{scalar::Scalar, edwards::EdwardsPoint}; use monero::{consensus::{Encodable, deserialize}, util::ringct::Bulletproof}; -use crate::{Commitment, transaction::TransactionError, free, c_generate_bp, c_verify_bp}; +use crate::{Commitment, transaction::TransactionError}; + +#[link(name = "wrapper")] +extern "C" { + fn free(ptr: *const u8); + fn c_generate_bp(len: u8, amounts: *const u64, masks: *const [u8; 32]) -> *const u8; + fn c_verify_bp( + serialized_len: usize, + serialized: *const u8, + commitments_len: u8, + commitments: *const [u8; 32] + ) -> bool; +} pub fn generate(outputs: &[Commitment]) -> Result { if outputs.len() > 16 { diff --git a/coins/monero/src/lib.rs b/coins/monero/src/lib.rs index 25a0efe2..d85b5f36 100644 --- a/coins/monero/src/lib.rs +++ b/coins/monero/src/lib.rs @@ -24,13 +24,7 @@ pub mod transaction; #[link(name = "wrapper")] extern "C" { - pub(crate) fn free(ptr: *const u8); fn c_hash_to_point(point: *const u8); - pub(crate) fn c_generate_bp(len: u8, amounts: *const u64, masks: *const [u8; 32]) -> *const u8; - pub(crate) fn c_verify_bp( - serialized_len: usize, serialized: *const u8, - commitments_len: u8, commitments: *const [u8; 32] - ) -> bool; } lazy_static! {