From 15b40c60ff806c997fd977ff407dbe9edd7742d8 Mon Sep 17 00:00:00 2001 From: EmilLuta Date: Thu, 29 Aug 2024 10:06:18 +0200 Subject: [PATCH] chore: Rename vk_setup to zksync_vk_setup It's inconsistent with the rest of the repository. This is a small tidying, only structural changes, no functionality involved. --- prover/Cargo.lock | 72 +++++++++---------- prover/Cargo.toml | 2 +- .../bin/proof_fri_compressor/Cargo.toml | 2 +- prover/crates/bin/prover_fri/Cargo.toml | 6 +- .../Cargo.toml | 2 +- .../crates/bin/witness_generator/Cargo.toml | 2 +- .../bin/witness_vector_generator/Cargo.toml | 2 +- 7 files changed, 44 insertions(+), 44 deletions(-) diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 2b04a9aa031..86b861528ae 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -6813,38 +6813,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "vk_setup_data_generator_server_fri" -version = "0.1.0" -dependencies = [ - "anyhow", - "bincode", - "circuit_definitions", - "clap 4.5.4", - "hex", - "indicatif", - "itertools 0.10.5", - "md5", - "once_cell", - "proptest", - "serde", - "serde_derive", - "serde_json", - "sha3 0.10.8", - "shivini", - "structopt", - "toml_edit 0.14.4", - "tracing", - "tracing-subscriber", - "zkevm_test_harness", - "zksync_config", - "zksync_env_config", - "zksync_prover_fri_types", - "zksync_types", - "zksync_utils", - "zksync_vlog", -] - [[package]] name = "vm2" version = "0.1.0" @@ -8037,7 +8005,6 @@ dependencies = [ "tokio", "tracing", "vise", - "vk_setup_data_generator_server_fri", "zkevm_test_harness", "zksync-wrapper-prover", "zksync_config", @@ -8050,6 +8017,7 @@ dependencies = [ "zksync_queued_job_processor", "zksync_types", "zksync_utils", + "zksync_vk_setup_data_generator_server_fri", "zksync_vlog", ] @@ -8138,7 +8106,6 @@ dependencies = [ "tokio", "tracing", "vise", - "vk_setup_data_generator_server_fri", "zkevm_test_harness", "zksync_config", "zksync_core_leftovers", @@ -8150,6 +8117,7 @@ dependencies = [ "zksync_queued_job_processor", "zksync_types", "zksync_utils", + "zksync_vk_setup_data_generator_server_fri", "zksync_vlog", ] @@ -8328,6 +8296,38 @@ dependencies = [ "zksync_vlog", ] +[[package]] +name = "zksync_vk_setup_data_generator_server_fri" +version = "0.1.0" +dependencies = [ + "anyhow", + "bincode", + "circuit_definitions", + "clap 4.5.4", + "hex", + "indicatif", + "itertools 0.10.5", + "md5", + "once_cell", + "proptest", + "serde", + "serde_derive", + "serde_json", + "sha3 0.10.8", + "shivini", + "structopt", + "toml_edit 0.14.4", + "tracing", + "tracing-subscriber", + "zkevm_test_harness", + "zksync_config", + "zksync_env_config", + "zksync_prover_fri_types", + "zksync_types", + "zksync_utils", + "zksync_vlog", +] + [[package]] name = "zksync_vlog" version = "0.1.0" @@ -8407,7 +8407,6 @@ dependencies = [ "tokio", "tracing", "vise", - "vk_setup_data_generator_server_fri", "zkevm_test_harness", "zksync_config", "zksync_core_leftovers", @@ -8422,6 +8421,7 @@ dependencies = [ "zksync_system_constants", "zksync_types", "zksync_utils", + "zksync_vk_setup_data_generator_server_fri", "zksync_vlog", ] @@ -8437,7 +8437,6 @@ dependencies = [ "tokio", "tracing", "vise", - "vk_setup_data_generator_server_fri", "zksync_config", "zksync_core_leftovers", "zksync_env_config", @@ -8448,6 +8447,7 @@ dependencies = [ "zksync_queued_job_processor", "zksync_types", "zksync_utils", + "zksync_vk_setup_data_generator_server_fri", "zksync_vlog", ] diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 88b5b626704..9d37c2fb5cb 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -87,7 +87,7 @@ zksync_periodic_job = { path = "../core/lib/periodic_job" } zksync_prover_dal = { path = "crates/lib/prover_dal" } zksync_prover_fri_types = { path = "crates/lib/prover_fri_types" } zksync_prover_fri_utils = { path = "crates/lib/prover_fri_utils" } -vk_setup_data_generator_server_fri = { path = "crates/bin/vk_setup_data_generator_server_fri" } +zksync_vk_setup_data_generator_server_fri = { path = "crates/bin/vk_setup_data_generator_server_fri" } # for `perf` profiling [profile.perf] diff --git a/prover/crates/bin/proof_fri_compressor/Cargo.toml b/prover/crates/bin/proof_fri_compressor/Cargo.toml index a44244c97b5..6f2d8b6fcc2 100644 --- a/prover/crates/bin/proof_fri_compressor/Cargo.toml +++ b/prover/crates/bin/proof_fri_compressor/Cargo.toml @@ -21,7 +21,7 @@ zksync_utils.workspace = true zksync_core_leftovers.workspace = true zksync_prover_fri_types.workspace = true zksync_queued_job_processor.workspace = true -vk_setup_data_generator_server_fri.workspace = true +zksync_vk_setup_data_generator_server_fri.workspace = true zksync_vlog.workspace = true circuit_sequencer_api.workspace = true diff --git a/prover/crates/bin/prover_fri/Cargo.toml b/prover/crates/bin/prover_fri/Cargo.toml index 0d2e92be048..ea7d7778315 100644 --- a/prover/crates/bin/prover_fri/Cargo.toml +++ b/prover/crates/bin/prover_fri/Cargo.toml @@ -22,14 +22,14 @@ zksync_prover_fri_utils.workspace = true zksync_core_leftovers.workspace = true zksync_prover_fri_types.workspace = true zksync_utils.workspace = true -vk_setup_data_generator_server_fri.workspace = true +zksync_vk_setup_data_generator_server_fri.workspace = true shivini = { workspace = true, optional = true, features = [ "circuit_definitions", "zksync", ] } zkevm_test_harness.workspace = true -circuit_definitions = { workspace = true, features = [ "log_tracing" ] } +circuit_definitions = { workspace = true, features = ["log_tracing"] } anyhow.workspace = true tracing.workspace = true @@ -45,4 +45,4 @@ clap = { workspace = true, features = ["derive"] } [features] default = [] -gpu = ["shivini", "vk_setup_data_generator_server_fri/gpu"] +gpu = ["shivini", "zksync_vk_setup_data_generator_server_fri/gpu"] diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/Cargo.toml b/prover/crates/bin/vk_setup_data_generator_server_fri/Cargo.toml index edae9764438..82f118fa476 100644 --- a/prover/crates/bin/vk_setup_data_generator_server_fri/Cargo.toml +++ b/prover/crates/bin/vk_setup_data_generator_server_fri/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "vk_setup_data_generator_server_fri" +name = "zksync_vk_setup_data_generator_server_fri" version.workspace = true edition.workspace = true authors.workspace = true diff --git a/prover/crates/bin/witness_generator/Cargo.toml b/prover/crates/bin/witness_generator/Cargo.toml index cffb5590606..e86656d15bb 100644 --- a/prover/crates/bin/witness_generator/Cargo.toml +++ b/prover/crates/bin/witness_generator/Cargo.toml @@ -22,7 +22,7 @@ zksync_multivm.workspace = true zksync_object_store.workspace = true zksync_types.workspace = true zksync_utils.workspace = true -vk_setup_data_generator_server_fri.workspace = true +zksync_vk_setup_data_generator_server_fri.workspace = true zksync_prover_fri_types.workspace = true zksync_prover_fri_utils.workspace = true zksync_core_leftovers.workspace = true diff --git a/prover/crates/bin/witness_vector_generator/Cargo.toml b/prover/crates/bin/witness_vector_generator/Cargo.toml index 6a1d0af861c..278ab2791d0 100644 --- a/prover/crates/bin/witness_vector_generator/Cargo.toml +++ b/prover/crates/bin/witness_vector_generator/Cargo.toml @@ -22,7 +22,7 @@ zksync_prover_fri_types.workspace = true zksync_core_leftovers.workspace = true zksync_queued_job_processor.workspace = true zksync_vlog.workspace = true -vk_setup_data_generator_server_fri.workspace = true +zksync_vk_setup_data_generator_server_fri.workspace = true anyhow.workspace = true tracing.workspace = true