From 985cf8a21fe358dd6b520fabe068f8212cb576a2 Mon Sep 17 00:00:00 2001 From: Daniyar Itegulov Date: Fri, 13 Sep 2024 16:15:04 +1000 Subject: [PATCH] fmt + lint --- core/lib/dal/src/models/storage_block.rs | 4 ++-- core/node/block_reverter/src/tests.rs | 5 +++-- core/node/fee_model/src/lib.rs | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/lib/dal/src/models/storage_block.rs b/core/lib/dal/src/models/storage_block.rs index c0b7fbab0f88..510a404a0fc7 100644 --- a/core/lib/dal/src/models/storage_block.rs +++ b/core/lib/dal/src/models/storage_block.rs @@ -8,9 +8,9 @@ use zksync_types::{ api, block::{L1BatchHeader, L2BlockHeader}, commitment::{L1BatchMetaParameters, L1BatchMetadata}, - fee_model::{BatchFeeInput, L1PeggedBatchFeeModelInput, PubdataIndependentBatchFeeModelInput}, + fee_model::BatchFeeInput, l2_to_l1_log::{L2ToL1Log, SystemL2ToL1Log, UserL2ToL1Log}, - Address, Bloom, L1BatchNumber, L2BlockNumber, ProtocolVersionId, H256, + Address, Bloom, L1BatchNumber, L2BlockNumber, H256, }; /// This is the gas limit that was used inside blocks before we started saving block gas limit into the database. diff --git a/core/node/block_reverter/src/tests.rs b/core/node/block_reverter/src/tests.rs index 1ffa20e1d57a..b06a774e0132 100644 --- a/core/node/block_reverter/src/tests.rs +++ b/core/node/block_reverter/src/tests.rs @@ -2,7 +2,6 @@ use std::{collections::HashSet, sync::Mutex}; -use super::*; use assert_matches::assert_matches; use async_trait::async_trait; use test_casing::test_casing; @@ -11,13 +10,15 @@ use zksync_dal::Connection; use zksync_merkle_tree::TreeInstruction; use zksync_object_store::{Bucket, MockObjectStore}; use zksync_state::interface::ReadStorage; -use zksync_types::fee_model::BatchFeeInput; use zksync_types::{ block::{L1BatchHeader, L2BlockHeader}, + fee_model::BatchFeeInput, snapshots::SnapshotVersion, AccountTreeId, L2BlockNumber, ProtocolVersion, ProtocolVersionId, StorageKey, StorageLog, }; +use super::*; + fn gen_storage_logs() -> Vec { (0..10) .map(|i| { diff --git a/core/node/fee_model/src/lib.rs b/core/node/fee_model/src/lib.rs index 8a7059dddddb..dc87eb44d69c 100644 --- a/core/node/fee_model/src/lib.rs +++ b/core/node/fee_model/src/lib.rs @@ -1,6 +1,5 @@ use std::{fmt, fmt::Debug, sync::Arc}; -use anyhow::Context as _; use async_trait::async_trait; use zksync_dal::{ConnectionPool, Core, CoreDal}; use zksync_types::{