From 8c72197c6f4a0b91dee622aa1292319e04cc39b8 Mon Sep 17 00:00:00 2001 From: "sm.wu" Date: Tue, 18 Feb 2025 16:38:46 +0800 Subject: [PATCH] cleanup dependency --- Cargo.lock | 125 ------------------------------------------ Cargo.toml | 2 - ff_ext/Cargo.toml | 2 - ff_ext/src/lib.rs | 4 +- mpcs/Cargo.toml | 2 - poseidon/Cargo.toml | 2 - transcript/Cargo.toml | 2 - 7 files changed, 1 insertion(+), 138 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 016acaf87..0ad4d2923 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -123,12 +123,6 @@ dependencies = [ "rand", ] -[[package]] -name = "arrayref" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" - [[package]] name = "arrayvec" version = "0.7.6" @@ -204,17 +198,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2b_simd" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "bumpalo" version = "3.16.0" @@ -481,12 +464,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "constant_time_eq" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" - [[package]] name = "cpp_demangle" version = "0.4.4" @@ -728,23 +705,10 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" -[[package]] -name = "ff" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" -dependencies = [ - "bitvec", - "rand_core", - "subtle", -] - [[package]] name = "ff_ext" version = "0.1.0" dependencies = [ - "ff", - "goldilocks", "p3-field", "p3-goldilocks", "p3-poseidon", @@ -836,30 +800,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" -[[package]] -name = "goldilocks" -version = "0.1.0" -source = "git+https://github.com/scroll-tech/ceno-Goldilocks#29a15d186ce4375dab346a3cc9eca6e43540cb8d" -dependencies = [ - "ff", - "halo2curves", - "itertools 0.12.1", - "rand_core", - "serde", - "subtle", -] - -[[package]] -name = "group" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" -dependencies = [ - "ff", - "rand_core", - "subtle", -] - [[package]] name = "half" version = "2.4.1" @@ -870,26 +810,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "halo2curves" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b1142bd1059aacde1b477e0c80c142910f1ceae67fc619311d6a17428007ab" -dependencies = [ - "blake2b_simd", - "ff", - "group", - "lazy_static", - "num-bigint", - "num-traits", - "pasta_curves", - "paste", - "rand", - "rand_core", - "static_assertions", - "subtle", -] - [[package]] name = "hashbrown" version = "0.14.5" @@ -1002,15 +922,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -1051,9 +962,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] [[package]] name = "libc" @@ -1135,10 +1043,8 @@ dependencies = [ "bitvec", "criterion", "ctr", - "ff", "ff_ext", "generic-array", - "goldilocks", "itertools 0.13.0", "multilinear_extensions", "num-bigint", @@ -1521,21 +1427,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "487f2ccd1e17ce8c1bfab3a65c89525af41cfad4c8659021a1e9a2aacd73b89b" -[[package]] -name = "pasta_curves" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095" -dependencies = [ - "blake2b_simd", - "ff", - "group", - "lazy_static", - "rand", - "static_assertions", - "subtle", -] - [[package]] name = "paste" version = "1.0.15" @@ -1638,9 +1529,7 @@ version = "0.1.0" dependencies = [ "ark-std", "criterion", - "ff", "ff_ext", - "goldilocks", "p3-field", "p3-goldilocks", "p3-mds", @@ -2105,12 +1994,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -2160,12 +2043,6 @@ dependencies = [ "syn 2.0.90", ] -[[package]] -name = "subtle" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - [[package]] name = "sumcheck" version = "0.1.0" @@ -2440,9 +2317,7 @@ name = "transcript" version = "0.1.0" dependencies = [ "crossbeam-channel", - "ff", "ff_ext", - "goldilocks", "p3-field", "p3-goldilocks", "p3-mds", diff --git a/Cargo.toml b/Cargo.toml index 9e686e612..b86c64b23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,8 +29,6 @@ ark-std = "0.4" cfg-if = "1.0" criterion = { version = "0.5", features = ["html_reports"] } crossbeam-channel = "0.5" -ff = "0.13" -goldilocks = { git = "https://github.com/scroll-tech/ceno-Goldilocks" } itertools = "0.13" num-derive = "0.4" num-traits = "0.2" diff --git a/ff_ext/Cargo.toml b/ff_ext/Cargo.toml index 1a2bd840a..7b492898e 100644 --- a/ff_ext/Cargo.toml +++ b/ff_ext/Cargo.toml @@ -10,8 +10,6 @@ repository.workspace = true version.workspace = true [dependencies] -ff.workspace = true -goldilocks.workspace = true serde.workspace = true rand_core.workspace = true p3-field.workspace = true diff --git a/ff_ext/src/lib.rs b/ff_ext/src/lib.rs index 52b053d42..a655491ef 100644 --- a/ff_ext/src/lib.rs +++ b/ff_ext/src/lib.rs @@ -1,8 +1,5 @@ #![deny(clippy::cargo)] -use std::{array::from_fn, iter::repeat_with}; - -pub use ff; use p3_field::{ ExtensionField as P3ExtensionField, Field as P3Field, PackedValue, PrimeField, TwoAdicField, extension::BinomialExtensionField, @@ -10,6 +7,7 @@ use p3_field::{ use p3_goldilocks::Goldilocks; use rand_core::RngCore; use serde::Serialize; +use std::{array::from_fn, iter::repeat_with}; pub type GoldilocksExt2 = BinomialExtensionField; fn array_try_from_uniform_bytes< diff --git a/mpcs/Cargo.toml b/mpcs/Cargo.toml index dbdedfdfd..9486d9013 100644 --- a/mpcs/Cargo.toml +++ b/mpcs/Cargo.toml @@ -14,11 +14,9 @@ aes = "0.8" ark-std.workspace = true bitvec = "1.0" ctr = "0.9" -ff.workspace = true ff_ext = { path = "../ff_ext" } # TODO: move to version 1, once our dependencies are updated generic-array = { version = "0.14", features = ["serde"] } -goldilocks.workspace = true itertools.workspace = true multilinear_extensions = { path = "../multilinear_extensions" } num-bigint = "0.4" diff --git a/poseidon/Cargo.toml b/poseidon/Cargo.toml index e4d33dc96..77c021e84 100644 --- a/poseidon/Cargo.toml +++ b/poseidon/Cargo.toml @@ -11,8 +11,6 @@ version.workspace = true [dependencies] criterion.workspace = true -ff.workspace = true -goldilocks.workspace = true serde.workspace = true ff_ext = { path = "../ff_ext" } unroll = "0.1" diff --git a/transcript/Cargo.toml b/transcript/Cargo.toml index 06a19346e..fc5943d09 100644 --- a/transcript/Cargo.toml +++ b/transcript/Cargo.toml @@ -11,9 +11,7 @@ version.workspace = true [dependencies] crossbeam-channel.workspace = true -ff.workspace = true ff_ext = { path = "../ff_ext" } -goldilocks.workspace = true poseidon.workspace = true serde.workspace = true p3-field.workspace = true