From 7ec533e119625c5e6109fe4c0917d1f7a10890cb Mon Sep 17 00:00:00 2001 From: Ryan Quinn Ford Date: Wed, 11 Sep 2024 13:09:15 +0200 Subject: [PATCH] trimming deps --- Cargo.lock | 63 --------------------------------------- Cargo.toml | 8 ++--- crates/common/Cargo.toml | 6 ---- crates/errors/Cargo.toml | 44 --------------------------- crates/groth16/Cargo.toml | 33 +------------------- crates/nova/Cargo.toml | 9 ++---- crates/prism/Cargo.toml | 11 +------ 7 files changed, 7 insertions(+), 167 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dcde70f..0e8e125 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3133,43 +3133,10 @@ name = "prism-errors" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", - "auto_impl", - "axum", - "base64 0.22.1", - "bellman", - "bls12_381", - "borsh", - "celestia-rpc", - "celestia-types", - "clap", - "config", - "criterion", - "dirs 5.0.1", - "dotenvy", "ed25519", "ed25519-dalek", - "ff", - "hex", - "indexed-merkle-tree", - "jmt", - "keystore-rs", - "log", - "mockall", - "pretty_env_logger", - "prism-common", - "rand", - "redis", - "serde", - "serde_json", - "serial_test", "sha2 0.10.8", "thiserror", - "tokio", - "toml", - "tower-http", - "utoipa", - "utoipa-swagger-ui", ] [[package]] @@ -3177,44 +3144,24 @@ name = "prism-groth16" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", - "auto_impl", - "axum", - "base64 0.22.1", "bellman", "bls12_381", "borsh", - "celestia-rpc", "celestia-types", - "clap", - "config", - "criterion", - "dirs 5.0.1", - "dotenvy", "ed25519", "ed25519-dalek", "ff", "hex", "indexed-merkle-tree", "jmt", - "keystore-rs", "log", - "mockall", - "pretty_env_logger", "prism-common", "prism-errors", "rand", - "redis", "serde", "serde_json", - "serial_test", "sha2 0.10.8", "thiserror", - "tokio", - "toml", - "tower-http", - "utoipa", - "utoipa-swagger-ui", ] [[package]] @@ -5253,13 +5200,3 @@ dependencies = [ "crossbeam-utils", "flate2", ] - -[[patch.unused]] -name = "sha2" -version = "0.10.6" -source = "git+https://github.com/sp1-patches/RustCrypto-hashes?branch=patch-sha2-v0.10.6#e5f8b7eaaa9801503bd998932a52b65848eee234" - -[[patch.unused]] -name = "sha2" -version = "0.9.8" -source = "git+https://github.com/sp1-patches/RustCrypto-hashes?branch=patch-sha2-v0.9.8#afdbfb09c325f8a69c01d540ec9a261e3637725d" diff --git a/Cargo.toml b/Cargo.toml index 87d8215..8b595d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,13 +85,11 @@ prism-groth16 = { path = "crates/groth16" } sp1-helper = "1.2.0" [patch.crates-io] -sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.9.8" } -sha2-v0-10-6 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.6" } sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } -[workspace.dev-dependencies] -serial_test = "3.1.1" -criterion = "0.5.1" +# [workspace.dev-dependencies] +# serial_test = "3.1.1" +# criterion = "0.5.1" # [[bench]] # name = "zk_benchmarks" diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index bc274c9..b1d85b9 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -16,9 +16,3 @@ hex.workspace = true sha2.workspace = true blake2.workspace = true celestia-types.workspace = true - -[patch.crates-io] -sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.9.8" } -blake2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "blake2", branch = "master" } -sha2-v0-10-6 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.6" } -sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } diff --git a/crates/errors/Cargo.toml b/crates/errors/Cargo.toml index 5a2b245..cdd976a 100644 --- a/crates/errors/Cargo.toml +++ b/crates/errors/Cargo.toml @@ -7,52 +7,8 @@ homepage.workspace = true repository.workspace = true [dependencies] -axum = { workspace = true } -borsh = { workspace = true } -tower-http = { workspace = true } -utoipa = { workspace = true } -utoipa-swagger-ui = { workspace = true } -async-trait = { workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -redis = { workspace = true } ed25519-dalek = { workspace = true } ed25519 = { workspace = true } -base64 = { workspace = true } -tokio = { workspace = true } -bellman = { workspace = true } -bls12_381 = { workspace = true } -rand = { workspace = true } -hex = { workspace = true } -ff = { workspace = true } -log = { workspace = true } -pretty_env_logger = { workspace = true } -clap = { workspace = true } -config = { workspace = true } thiserror = { workspace = true } -indexed-merkle-tree = { workspace = true } -dotenvy = { workspace = true } -celestia-rpc = { workspace = true } -celestia-types = { workspace = true } -mockall = { workspace = true } -keystore-rs = { workspace = true } -toml = { workspace = true } -dirs = { workspace = true } anyhow = { workspace = true } -jmt = { workspace = true, path = "../jmt", features = ["mocks"] } sha2 = { workspace = true } -auto_impl = { workspace = true } -prism-common = { workspace = true } - -[patch.crates-io] -sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.9.8" } -sha2-v0-10-6 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.6" } -sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } - -[dev-dependencies] -serial_test = "3.1.1" -criterion = "0.5.1" - -# [[bench]] -# name = "zk_benchmarks" -# harness = false diff --git a/crates/groth16/Cargo.toml b/crates/groth16/Cargo.toml index 373bb13..c4f7fb3 100644 --- a/crates/groth16/Cargo.toml +++ b/crates/groth16/Cargo.toml @@ -7,53 +7,22 @@ homepage.workspace = true repository.workspace = true [dependencies] -axum = { workspace = true } borsh = { workspace = true } -tower-http = { workspace = true } -utoipa = { workspace = true } -utoipa-swagger-ui = { workspace = true } -async-trait = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -redis = { workspace = true } ed25519-dalek = { workspace = true } ed25519 = { workspace = true } -base64 = { workspace = true } -tokio = { workspace = true } bellman = { workspace = true } bls12_381 = { workspace = true } rand = { workspace = true } hex = { workspace = true } ff = { workspace = true } log = { workspace = true } -pretty_env_logger = { workspace = true } -clap = { workspace = true } -config = { workspace = true } thiserror = { workspace = true } indexed-merkle-tree = { workspace = true } -dotenvy = { workspace = true } -celestia-rpc = { workspace = true } celestia-types = { workspace = true } -mockall = { workspace = true } -keystore-rs = { workspace = true } -toml = { workspace = true } -dirs = { workspace = true } anyhow = { workspace = true } -jmt = { workspace = true, path = "../jmt", features = ["mocks"] } +jmt = { workspace = true } sha2 = { workspace = true } -auto_impl = { workspace = true } prism-common = { workspace = true } prism-errors = { workspace = true } - -[patch.crates-io] -sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.9.8" } -sha2-v0-10-6 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.6" } -sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } - -[dev-dependencies] -serial_test = "3.1.1" -criterion = "0.5.1" - -# [[bench]] -# name = "zk_benchmarks" -# harness = false diff --git a/crates/nova/Cargo.toml b/crates/nova/Cargo.toml index 272da1d..1483105 100644 --- a/crates/nova/Cargo.toml +++ b/crates/nova/Cargo.toml @@ -21,16 +21,11 @@ thiserror = { workspace = true } indexed-merkle-tree = { workspace = true } celestia-types = { workspace = true } anyhow = { workspace = true } -jmt = { workspace = true, path = "../jmt", features = ["mocks"] } +jmt = { workspace = true } bellpepper-core = { workspace = true } bellpepper = { workspace = true } -arecibo = { workspace = true, git = "https://github.com/deltadevsde/arecibo" } +arecibo = { workspace = true } itertools = { workspace = true } sha2 = { workspace = true } bincode = { workspace = true } prism-common = { workspace = true } - -[patch.crates-io] -sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.9.8" } -sha2-v0-10-6 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.6" } -sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } diff --git a/crates/prism/Cargo.toml b/crates/prism/Cargo.toml index 088b4a9..dbc8d2a 100644 --- a/crates/prism/Cargo.toml +++ b/crates/prism/Cargo.toml @@ -39,22 +39,13 @@ keystore-rs = { workspace = true } toml = { workspace = true } dirs = { workspace = true } anyhow = { workspace = true } -jmt = { workspace = true, path = "../jmt", features = ["mocks"] } +jmt = { workspace = true } sha2 = { workspace = true } auto_impl = { workspace = true } prism-common = { workspace = true } prism-errors = { workspace = true } prism-groth16 = { workspace = true } -[patch.crates-io] -sha2-v0-9-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.9.8" } -sha2-v0-10-6 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.6" } -sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-sha2-v0.10.8" } - [dev-dependencies] serial_test = "3.1.1" criterion = "0.5.1" - -# [[bench]] -# name = "zk_benchmarks" -# harness = false