diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3185d5c..779a20c 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -151,13 +151,20 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +[[package]] +name = "logos-blockchain-circuits-common" +version = "0.4.2" +dependencies = [ + "logos-blockchain-circuits-types", +] + [[package]] name = "logos-blockchain-circuits-poc-sys" version = "0.4.2" dependencies = [ "flate2", + "logos-blockchain-circuits-common", "logos-blockchain-circuits-types", - "logos-blockchain-circuits-utils", "tar", "ureq", ] @@ -167,8 +174,8 @@ name = "logos-blockchain-circuits-pol-sys" version = "0.4.2" dependencies = [ "flate2", + "logos-blockchain-circuits-common", "logos-blockchain-circuits-types", - "logos-blockchain-circuits-utils", "tar", "ureq", ] @@ -178,8 +185,8 @@ name = "logos-blockchain-circuits-poq-sys" version = "0.4.2" dependencies = [ "flate2", + "logos-blockchain-circuits-common", "logos-blockchain-circuits-types", - "logos-blockchain-circuits-utils", "tar", "ureq", ] @@ -189,8 +196,8 @@ name = "logos-blockchain-circuits-signature-sys" version = "0.4.2" dependencies = [ "flate2", + "logos-blockchain-circuits-common", "logos-blockchain-circuits-types", - "logos-blockchain-circuits-utils", "tar", "ureq", ] @@ -202,13 +209,6 @@ dependencies = [ "libc", ] -[[package]] -name = "logos-blockchain-circuits-utils" -version = "0.4.2" -dependencies = [ - "logos-blockchain-circuits-types", -] - [[package]] name = "miniz_oxide" version = "0.8.9" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 123bd58..a0f4dd0 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -15,7 +15,7 @@ members = [ "logos-blockchain-circuits-poq-sys", "logos-blockchain-circuits-signature-sys", "logos-blockchain-circuits-types", - "logos-blockchain-circuits-utils" + "logos-blockchain-circuits-common" ] resolver = "3" @@ -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-utils = { default-features = false, package = "logos-blockchain-circuits-utils", path = "./logos-blockchain-circuits-utils" } +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-utils/Cargo.toml b/rust/logos-blockchain-circuits-common/Cargo.toml similarity index 86% rename from rust/logos-blockchain-circuits-utils/Cargo.toml rename to rust/logos-blockchain-circuits-common/Cargo.toml index 4a6d36c..edb780c 100644 --- a/rust/logos-blockchain-circuits-utils/Cargo.toml +++ b/rust/logos-blockchain-circuits-common/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "logos-blockchain-circuits-utils" +name = "logos-blockchain-circuits-common" categories.workspace = true description.workspace = true edition.workspace = true diff --git a/rust/logos-blockchain-circuits-utils/src/lib.rs b/rust/logos-blockchain-circuits-common/src/lib.rs similarity index 100% rename from rust/logos-blockchain-circuits-utils/src/lib.rs rename to rust/logos-blockchain-circuits-common/src/lib.rs diff --git a/rust/logos-blockchain-circuits-utils/src/string.rs b/rust/logos-blockchain-circuits-common/src/string.rs similarity index 100% rename from rust/logos-blockchain-circuits-utils/src/string.rs rename to rust/logos-blockchain-circuits-common/src/string.rs diff --git a/rust/logos-blockchain-circuits-poc-sys/Cargo.toml b/rust/logos-blockchain-circuits-poc-sys/Cargo.toml index a3e823e..8b0dc92 100644 --- a/rust/logos-blockchain-circuits-poc-sys/Cargo.toml +++ b/rust/logos-blockchain-circuits-poc-sys/Cargo.toml @@ -11,7 +11,7 @@ version.workspace = true [dependencies] lbc-types = { workspace = true } -lbc-utils = { workspace = true } +lbc-common = { workspace = true } [build-dependencies] flate2 = { workspace = true } diff --git a/rust/logos-blockchain-circuits-poc-sys/src/native.rs b/rust/logos-blockchain-circuits-poc-sys/src/native.rs index 692c3f4..a6222c2 100644 --- a/rust/logos-blockchain-circuits-poc-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-poc-sys/src/native.rs @@ -1,7 +1,7 @@ use std::path::Path; use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_types::inputs::CircuitDat; -use lbc_utils::string::path_as_null_terminated_string; +use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{poc_generate_witness, poc_generate_witness_from_files}; pub(crate) const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POC_LIB_DIR"), "/witness_generator.dat")); diff --git a/rust/logos-blockchain-circuits-pol-sys/Cargo.toml b/rust/logos-blockchain-circuits-pol-sys/Cargo.toml index dbc9505..012be26 100644 --- a/rust/logos-blockchain-circuits-pol-sys/Cargo.toml +++ b/rust/logos-blockchain-circuits-pol-sys/Cargo.toml @@ -11,7 +11,7 @@ version.workspace = true [dependencies] lbc-types = { workspace = true } -lbc-utils = { workspace = true } +lbc-common = { workspace = true } [build-dependencies] flate2 = { workspace = true } diff --git a/rust/logos-blockchain-circuits-pol-sys/src/native.rs b/rust/logos-blockchain-circuits-pol-sys/src/native.rs index 2011767..469c3db 100644 --- a/rust/logos-blockchain-circuits-pol-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-pol-sys/src/native.rs @@ -1,7 +1,7 @@ use std::path::Path; use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_types::inputs::CircuitDat; -use lbc_utils::string::path_as_null_terminated_string; +use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{pol_generate_witness, pol_generate_witness_from_files}; pub(crate) const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POL_LIB_DIR"), "/witness_generator.dat")); diff --git a/rust/logos-blockchain-circuits-poq-sys/Cargo.toml b/rust/logos-blockchain-circuits-poq-sys/Cargo.toml index b3eff0f..a3e919d 100644 --- a/rust/logos-blockchain-circuits-poq-sys/Cargo.toml +++ b/rust/logos-blockchain-circuits-poq-sys/Cargo.toml @@ -11,7 +11,7 @@ version.workspace = true [dependencies] lbc-types = { workspace = true } -lbc-utils = { workspace = true } +lbc-common = { workspace = true } [build-dependencies] flate2 = { workspace = true } diff --git a/rust/logos-blockchain-circuits-poq-sys/src/native.rs b/rust/logos-blockchain-circuits-poq-sys/src/native.rs index 3ee935e..af7bb03 100644 --- a/rust/logos-blockchain-circuits-poq-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-poq-sys/src/native.rs @@ -1,7 +1,7 @@ use std::path::Path; use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_types::inputs::CircuitDat; -use lbc_utils::string::path_as_null_terminated_string; +use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{poq_generate_witness, poq_generate_witness_from_files}; pub(crate) const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_POQ_LIB_DIR"), "/witness_generator.dat")); diff --git a/rust/logos-blockchain-circuits-signature-sys/Cargo.toml b/rust/logos-blockchain-circuits-signature-sys/Cargo.toml index fabc71e..81f8e8a 100644 --- a/rust/logos-blockchain-circuits-signature-sys/Cargo.toml +++ b/rust/logos-blockchain-circuits-signature-sys/Cargo.toml @@ -11,7 +11,7 @@ version.workspace = true [dependencies] lbc-types = { workspace = true } -lbc-utils = { workspace = true } +lbc-common = { workspace = true } [build-dependencies] flate2 = { workspace = true } diff --git a/rust/logos-blockchain-circuits-signature-sys/src/native.rs b/rust/logos-blockchain-circuits-signature-sys/src/native.rs index 91e59e3..e8df03f 100644 --- a/rust/logos-blockchain-circuits-signature-sys/src/native.rs +++ b/rust/logos-blockchain-circuits-signature-sys/src/native.rs @@ -1,7 +1,7 @@ use std::path::Path; use lbc_types::{ffi, native::{Bytes, Error}}; use lbc_types::inputs::CircuitDat; -use lbc_utils::string::path_as_null_terminated_string; +use lbc_common::string::path_as_null_terminated_string; use crate::ffi::{signature_generate_witness, signature_generate_witness_from_files}; pub(crate) const RAW_CIRCUIT_DAT: &[u8] = include_bytes!(concat!(env!("LBC_SIGNATURE_LIB_DIR"), "/witness_generator.dat"));