Skip to content

Commit

Permalink
Fix imports in prover crates
Browse files Browse the repository at this point in the history
  • Loading branch information
popzxc committed Oct 17, 2023
1 parent c19e79e commit eb660d1
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions prover/prover_fri/src/gpu_prover_job_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion prover/prover_fri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions prover/prover_fri/src/prover_job_processor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
3 changes: 1 addition & 2 deletions prover/prover_fri/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<AbsorptionModeOverwrite>;
Expand Down
1 change: 1 addition & 0 deletions prover/witness_generator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion prover/witness_generator/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ 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,
};
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};

Expand Down
2 changes: 1 addition & 1 deletion prover/witness_vector_generator/src/generator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit eb660d1

Please sign in to comment.