From eb660d11574748da0e133b764125402961c53b10 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Tue, 17 Oct 2023 15:34:17 +0400 Subject: [PATCH] Fix imports in prover crates --- prover/prover_fri/src/gpu_prover_job_processor.rs | 4 ++-- prover/prover_fri/src/main.rs | 3 ++- prover/prover_fri/src/prover_job_processor.rs | 4 ++-- prover/prover_fri/src/utils.rs | 3 +-- prover/witness_generator/Cargo.toml | 1 + prover/witness_generator/src/utils.rs | 2 +- prover/witness_vector_generator/src/generator.rs | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/prover/prover_fri/src/gpu_prover_job_processor.rs b/prover/prover_fri/src/gpu_prover_job_processor.rs index 7742107c4c9a..270f94998c61 100644 --- a/prover/prover_fri/src/gpu_prover_job_processor.rs +++ b/prover/prover_fri/src/gpu_prover_job_processor.rs @@ -16,13 +16,13 @@ pub mod gpu_prover { use zksync_prover_fri_types::circuit_definitions::circuit_definitions::recursion_layer::ZkSyncRecursionLayerProof; use zksync_prover_fri_types::WitnessVectorArtifacts; - use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig}; + use zksync_config::configs::fri_prover_group::FriProverGroupConfig; use zksync_config::configs::FriProverConfig; use zksync_dal::ConnectionPool; use zksync_object_store::ObjectStore; use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper, ProverServiceDataKey}; use zksync_queued_job_processor::{async_trait, JobProcessor}; - use zksync_types::proofs::SocketAddress; + use zksync_types::{basic_fri_types::CircuitIdRoundTuple, proofs::SocketAddress}; use zksync_vk_setup_data_server_fri::get_setup_data_for_circuit_type; use { shivini::gpu_prove_from_external_witness_data, shivini::ProverContext, diff --git a/prover/prover_fri/src/main.rs b/prover/prover_fri/src/main.rs index c0c428d1c711..f387393c0727 100644 --- a/prover/prover_fri/src/main.rs +++ b/prover/prover_fri/src/main.rs @@ -6,7 +6,7 @@ use tokio::sync::watch::Receiver; use tokio::task::JoinHandle; use prometheus_exporter::PrometheusExporterConfig; -use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig}; +use zksync_config::configs::fri_prover_group::FriProverGroupConfig; use zksync_config::configs::FriProverConfig; use zksync_config::ObjectStoreConfig; use zksync_dal::connection::DbVariant; @@ -17,6 +17,7 @@ use zksync_prover_fri_utils::get_all_circuit_id_round_tuples_for; use local_ip_address::local_ip; use zksync_prover_utils::region_fetcher::get_zone; use zksync_queued_job_processor::JobProcessor; +use zksync_types::basic_fri_types::CircuitIdRoundTuple; use zksync_types::proofs::GpuProverInstanceStatus; use zksync_types::proofs::SocketAddress; use zksync_utils::wait_for_tasks::wait_for_tasks; diff --git a/prover/prover_fri/src/prover_job_processor.rs b/prover/prover_fri/src/prover_job_processor.rs index 84e0d0a9b409..e4354c697113 100644 --- a/prover/prover_fri/src/prover_job_processor.rs +++ b/prover/prover_fri/src/prover_job_processor.rs @@ -19,14 +19,14 @@ use zksync_prover_fri_types::circuit_definitions::{ use zkevm_test_harness::prover_utils::{prove_base_layer_circuit, prove_recursion_layer_circuit}; -use zksync_config::configs::fri_prover_group::{CircuitIdRoundTuple, FriProverGroupConfig}; +use zksync_config::configs::fri_prover_group::FriProverGroupConfig; use zksync_config::configs::FriProverConfig; use zksync_dal::ConnectionPool; use zksync_object_store::ObjectStore; use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper, ProverJob, ProverServiceDataKey}; use zksync_prover_fri_utils::fetch_next_circuit; use zksync_queued_job_processor::{async_trait, JobProcessor}; -use zksync_types::protocol_version::L1VerifierConfig; +use zksync_types::{basic_fri_types::CircuitIdRoundTuple, protocol_version::L1VerifierConfig}; use zksync_vk_setup_data_server_fri::{ get_cpu_setup_data_for_circuit_type, GoldilocksProverSetupData, }; diff --git a/prover/prover_fri/src/utils.rs b/prover/prover_fri/src/utils.rs index 2860e607b1e7..de8791c2916b 100644 --- a/prover/prover_fri/src/utils.rs +++ b/prover/prover_fri/src/utils.rs @@ -7,7 +7,6 @@ use zksync_prover_fri_types::circuit_definitions::boojum::cs::implementations::r use tokio::sync::Mutex; use zkevm_test_harness::prover_utils::{verify_base_layer_proof, verify_recursion_layer_proof}; -use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple; use zksync_dal::StorageProcessor; use zksync_object_store::ObjectStore; use zksync_prover_fri_types::circuit_definitions::boojum::algebraic_props::round_function::AbsorptionModeOverwrite; @@ -25,7 +24,7 @@ use zksync_prover_fri_types::{ }; use zksync_prover_fri_utils::get_base_layer_circuit_id_for_recursive_layer; -use zksync_types::L1BatchNumber; +use zksync_types::{basic_fri_types::CircuitIdRoundTuple, L1BatchNumber}; pub type F = GoldilocksField; pub type H = GoldilocksPoseidon2Sponge; diff --git a/prover/witness_generator/Cargo.toml b/prover/witness_generator/Cargo.toml index 21dec33f0301..f5a7480195c0 100644 --- a/prover/witness_generator/Cargo.toml +++ b/prover/witness_generator/Cargo.toml @@ -13,6 +13,7 @@ publish = false # We don't want to publish our binaries. [dependencies] zksync_dal = { path = "../../core/lib/dal" } zksync_config = { path = "../../core/lib/config" } +zksync_system_constants = { path = "../../core/lib/constants" } prometheus_exporter = { path = "../../core/lib/prometheus_exporter" } vlog = { path = "../../core/lib/vlog" } zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor" } diff --git a/prover/witness_generator/src/utils.rs b/prover/witness_generator/src/utils.rs index 19b3d3239e57..0a70858977f7 100644 --- a/prover/witness_generator/src/utils.rs +++ b/prover/witness_generator/src/utils.rs @@ -11,7 +11,6 @@ use zksync_prover_fri_types::circuit_definitions::encodings::recursion_request:: use zkevm_test_harness::boojum::field::goldilocks::GoldilocksField; use zkevm_test_harness::witness::full_block_artifact::BlockBasicCircuits; -use zksync_config::constants::USED_BOOTLOADER_MEMORY_BYTES; use zksync_object_store::{ serialize_using_bincode, AggregationsKey, Bucket, ClosedFormInputKey, FriCircuitKey, ObjectStore, StoredObject, @@ -19,6 +18,7 @@ use zksync_object_store::{ use zksync_prover_fri_types::circuit_definitions::zkevm_circuits::scheduler::input::SchedulerCircuitInstanceWitness; use zksync_prover_fri_types::circuit_definitions::ZkSyncDefaultRoundFunction; use zksync_prover_fri_types::{CircuitWrapper, FriProofWrapper}; +use zksync_system_constants::USED_BOOTLOADER_MEMORY_BYTES; use zksync_types::proofs::AggregationRound; use zksync_types::{L1BatchNumber, U256}; diff --git a/prover/witness_vector_generator/src/generator.rs b/prover/witness_vector_generator/src/generator.rs index 247153984911..9851802a54b2 100644 --- a/prover/witness_vector_generator/src/generator.rs +++ b/prover/witness_vector_generator/src/generator.rs @@ -5,7 +5,6 @@ use async_trait::async_trait; use tokio::task::JoinHandle; use tokio::time::sleep; -use zksync_config::configs::fri_prover_group::CircuitIdRoundTuple; use zksync_config::configs::FriWitnessVectorGeneratorConfig; use zksync_dal::ConnectionPool; use zksync_object_store::ObjectStore; @@ -15,6 +14,7 @@ use zksync_prover_fri_utils::fetch_next_circuit; use zksync_prover_fri_utils::get_numeric_circuit_id; use zksync_prover_fri_utils::socket_utils::send_assembly; use zksync_queued_job_processor::JobProcessor; +use zksync_types::basic_fri_types::CircuitIdRoundTuple; use zksync_types::proofs::{GpuProverInstanceStatus, SocketAddress}; use zksync_types::protocol_version::L1VerifierConfig; use zksync_vk_setup_data_server_fri::get_finalization_hints;