diff --git a/rust/Cargo.toml b/rust/Cargo.toml index a0f4dd0..c1f4b44 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -26,7 +26,7 @@ lbc-pol-sys = { default-features = false, package = "logos-blockchain-circ lbc-poq-sys = { default-features = false, package = "logos-blockchain-circuits-poq-sys", path = "./logos-blockchain-circuits-poq-sys" } lbc-signature-sys = { default-features = false, package = "logos-blockchain-circuits-signature-sys", path = "./logos-blockchain-circuits-signature-sys" } lbc-types = { default-features = false, package = "logos-blockchain-circuits-types", path = "./logos-blockchain-circuits-types" } -lbc-common = { default-features = false, package = "logos-blockchain-circuits-common", path = "./logos-blockchain-circuits-common" } +lbc-common = { default-features = false, package = "logos-blockchain-circuits-common", path = "./logos-blockchain-circuits-common" } # External flate2 = "1" diff --git a/rust/logos-blockchain-circuits-common/src/string.rs b/rust/logos-blockchain-circuits-common/src/string.rs index 86e7348..fbaeff5 100644 --- a/rust/logos-blockchain-circuits-common/src/string.rs +++ b/rust/logos-blockchain-circuits-common/src/string.rs @@ -1,7 +1,7 @@ use std::path::Path; use lbc_types::native::Error; -pub fn into_null_terminated_string( +pub fn as_null_terminated_string( string: &str, ) -> Result { std::ffi::CString::new(string) @@ -12,5 +12,5 @@ pub fn path_as_null_terminated_string( path: &Path, ) -> Result { let path = path.to_str().ok_or(Error::InvalidInput(Some(format!("Could not convert the path to a string: {}", path.display()))))?; - into_null_terminated_string(path) + as_null_terminated_string(path) } diff --git a/rust/logos-blockchain-circuits-poc-sys/src/native.rs b/rust/logos-blockchain-circuits-poc-sys/src/native.rs index 0e516ca..42eede4 100644 --- a/rust/logos-blockchain-circuits-poc-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-poc-sys/src/native.rs @@ -3,7 +3,7 @@ use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{poc_generate_witness, poc_generate_witness_from_files}; -const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POC_LIB_DIR"), "/witness_generator.dat")); +static RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POC_LIB_DIR"), "/witness_generator.dat")); pub struct PocDat; impl lbc_types::CircuitDat for PocDat { diff --git a/rust/logos-blockchain-circuits-pol-sys/src/native.rs b/rust/logos-blockchain-circuits-pol-sys/src/native.rs index 35dd11d..f7b0aa1 100644 --- a/rust/logos-blockchain-circuits-pol-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-pol-sys/src/native.rs @@ -3,7 +3,7 @@ use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{pol_generate_witness, pol_generate_witness_from_files}; -const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POL_LIB_DIR"), "/witness_generator.dat")); +static RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POL_LIB_DIR"), "/witness_generator.dat")); pub struct PolDat; impl lbc_types::CircuitDat for PolDat { diff --git a/rust/logos-blockchain-circuits-poq-sys/src/native.rs b/rust/logos-blockchain-circuits-poq-sys/src/native.rs index 4c5a6b6..d9e93b1 100644 --- a/rust/logos-blockchain-circuits-poq-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-poq-sys/src/native.rs @@ -3,7 +3,7 @@ use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{poq_generate_witness, poq_generate_witness_from_files}; -const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POQ_LIB_DIR"), "/witness_generator.dat")); +static RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POQ_LIB_DIR"), "/witness_generator.dat")); pub struct PoqDat; impl lbc_types::CircuitDat for PoqDat { diff --git a/rust/logos-blockchain-circuits-signature-sys/src/native.rs b/rust/logos-blockchain-circuits-signature-sys/src/native.rs index 0f415f8..6498c99 100644 --- a/rust/logos-blockchain-circuits-signature-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-signature-sys/src/native.rs @@ -3,7 +3,7 @@ use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{signature_generate_witness, signature_generate_witness_from_files}; -const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_SIGNATURE_LIB_DIR"), "/witness_generator.dat")); +static RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_SIGNATURE_LIB_DIR"), "/witness_generator.dat")); pub struct SignatureDat; impl lbc_types::CircuitDat for SignatureDat { diff --git a/rust/logos-blockchain-circuits-types/src/native/circuit_witness_input.rs b/rust/logos-blockchain-circuits-types/src/native/circuit_witness_input.rs index 125d6cc..eb8e8c9 100644 --- a/rust/logos-blockchain-circuits-types/src/native/circuit_witness_input.rs +++ b/rust/logos-blockchain-circuits-types/src/native/circuit_witness_input.rs @@ -17,18 +17,6 @@ impl<'input, Dat: CircuitDat> CircuitWitnessInput<'input, Dat> { } } -impl<'input, Dat> From> for WitnessInput<'input> { - fn from(value: CircuitWitnessInput<'input, Dat>) -> Self { - value.inner - } -} - -impl<'input, Dat> From> for CircuitWitnessInput<'input, Dat> { - fn from(value: WitnessInput<'input>) -> Self { - Self { inner: value, _phantom: Default::default() } - } -} - impl<'input, Dat> Deref for CircuitWitnessInput<'input, Dat> { type Target = WitnessInput<'input>;