Skip to content

Commit

Permalink
fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
StanislavBreadless committed Jul 31, 2024
1 parent 2894721 commit 338eade
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
8 changes: 1 addition & 7 deletions core/lib/protobuf_config/src/genesis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use std::str::FromStr;
use anyhow::Context as _;
use zksync_basic_types::{
commitment::L1BatchCommitmentMode, protocol_version::ProtocolSemanticVersion, L2ChainId,
SLChainId,
};
use zksync_config::configs;
use zksync_protobuf::{repr::ProtoRepr, required};
Expand Down Expand Up @@ -72,12 +71,7 @@ impl ProtoRepr for proto::Genesis {
l1_chain_id: required(&self.l1_chain_id)
.map(|x| L1ChainId(*x))
.context("l1_chain_id")?,
// TODO(X): for now, the settlement layer is always the same as the L1 network
sl_chain_id: Some(
required(&self.l1_chain_id)
.map(|x| SLChainId(*x))
.context("l1_chain_id")?,
),
sl_chain_id: None,
l2_chain_id: required(&self.l2_chain_id)
.and_then(|x| L2ChainId::try_from(*x).map_err(|a| anyhow::anyhow!(a)))
.context("l2_chain_id")?,
Expand Down
2 changes: 1 addition & 1 deletion core/node/api_server/src/web3/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use zksync_metadata_calculator::api_server::TreeApiClient;
use zksync_node_sync::SyncState;
use zksync_types::{
api, commitment::L1BatchCommitmentMode, l2::L2Tx, transaction_request::CallRequest, Address,
L1BatchNumber, L1ChainId, L2BlockNumber, L2ChainId, SLChainId, H256, U256, U64,
L1BatchNumber, L1ChainId, L2BlockNumber, L2ChainId, H256, U256, U64,
};
use zksync_web3_decl::{error::Web3Error, types::Filter};

Expand Down
2 changes: 0 additions & 2 deletions core/node/genesis/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,6 @@ pub struct GenesisBatchParams {
}

pub fn mock_genesis_config() -> GenesisConfig {
use zksync_types::SLChainId;

let base_system_contracts_hashes = BaseSystemContracts::load_from_disk().hashes();
let first_l1_verifier_config = L1VerifierConfig::default();

Expand Down

0 comments on commit 338eade

Please sign in to comment.