mirror of
https://github.com/logos-blockchain/logos-blockchain-circuits.git
synced 2026-06-10 02:30:05 +00:00
Remove unused Froms. Fix names and keywords.
This commit is contained in:
parent
900bee972c
commit
4e826bbe94
@ -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"
|
||||
|
||||
@ -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, Error> {
|
||||
std::ffi::CString::new(string)
|
||||
@ -12,5 +12,5 @@ pub fn path_as_null_terminated_string(
|
||||
path: &Path,
|
||||
) -> Result<std::ffi::CString, Error> {
|
||||
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)
|
||||
}
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -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 {
|
||||
|
||||
@ -17,18 +17,6 @@ impl<'input, Dat: CircuitDat> CircuitWitnessInput<'input, Dat> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'input, Dat> From<CircuitWitnessInput<'input, Dat>> for WitnessInput<'input> {
|
||||
fn from(value: CircuitWitnessInput<'input, Dat>) -> Self {
|
||||
value.inner
|
||||
}
|
||||
}
|
||||
|
||||
impl<'input, Dat> From<WitnessInput<'input>> 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>;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user