Skip to content

Commit

Permalink
make dal build
Browse files Browse the repository at this point in the history
  • Loading branch information
Artemka374 committed Mar 11, 2024
1 parent ccd0bc9 commit 24ebf2b
Show file tree
Hide file tree
Showing 50 changed files with 737 additions and 138 deletions.
6 changes: 3 additions & 3 deletions core/bin/contract-verifier/src/verifier.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use lazy_static::lazy_static;
use regex::Regex;
use tokio::time;
use zksync_config::ContractVerifierConfig;
use zksync_dal::{BasicStorageProcessor, ConnectionPool};
use zksync_dal::{ConnectionPool, ServerProcessor};
use zksync_env_config::FromEnv;
use zksync_queued_job_processor::{async_trait, JobProcessor};
use zksync_types::{
Expand Down Expand Up @@ -54,7 +54,7 @@ impl ContractVerifier {
}

async fn verify(
storage: &mut BasicStorageProcessor<'_>,
storage: &mut ServerProcessor<'_>,
mut request: VerificationRequest,
config: ContractVerifierConfig,
) -> Result<VerificationInfo, ContractVerifierError> {
Expand Down Expand Up @@ -429,7 +429,7 @@ impl ContractVerifier {
}

async fn process_result(
storage: &mut BasicStorageProcessor<'_>,
storage: &mut ServerProcessor<'_>,
request_id: usize,
verification_result: Result<VerificationInfo, ContractVerifierError>,
) {
Expand Down
2 changes: 1 addition & 1 deletion core/bin/snapshots_creator/src/creator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::sync::Arc;
use anyhow::Context as _;
use tokio::sync::Semaphore;
use zksync_config::SnapshotsCreatorConfig;
use zksync_dal::{BasicStorageProcessor, ConnectionPool, Server, ServerProcessor};
use zksync_dal::{ConnectionPool, Server, ServerProcessor};
use zksync_object_store::ObjectStore;
use zksync_types::{
snapshots::{
Expand Down
8 changes: 4 additions & 4 deletions core/bin/snapshots_creator/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{
};

use rand::{thread_rng, Rng};
use zksync_dal::BasicStorageProcessor;
use zksync_dal::ServerProcessor;
use zksync_object_store::ObjectStore;
use zksync_types::{
block::{L1BatchHeader, MiniblockHeader},
Expand Down Expand Up @@ -132,7 +132,7 @@ struct ExpectedOutputs {
}

async fn create_miniblock(
conn: &mut BasicStorageProcessor<'_>,
conn: &mut ServerProcessor<'_>,
miniblock_number: MiniblockNumber,
block_logs: Vec<StorageLog>,
) {
Expand Down Expand Up @@ -162,7 +162,7 @@ async fn create_miniblock(
}

async fn create_l1_batch(
conn: &mut BasicStorageProcessor<'_>,
conn: &mut ServerProcessor<'_>,
l1_batch_number: L1BatchNumber,
logs_for_initial_writes: &[StorageLog],
) {
Expand All @@ -186,7 +186,7 @@ async fn create_l1_batch(

async fn prepare_postgres(
rng: &mut impl Rng,
conn: &mut BasicStorageProcessor<'_>,
conn: &mut ServerProcessor<'_>,
block_count: u32,
) -> ExpectedOutputs {
conn.protocol_versions_dal()
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 24ebf2b

Please sign in to comment.