Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
impv(celestia_client): run linter
Browse files Browse the repository at this point in the history
  • Loading branch information
irnb committed Jun 28, 2024
1 parent a398533 commit 4478d65
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 12 deletions.
7 changes: 5 additions & 2 deletions core/bin/zksync_server/src/node_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
use anyhow::Context;
use prometheus_exporter::PrometheusExporterConfig;
use via_da_clients::celestia::{
config::ViaCelestiaConf, wiring_layer::ViaCelestiaClientWiringLayer,
};
use zksync_config::{
configs::{
consensus::ConsensusConfig, eth_sender::PubdataSendingMode, wallets::Wallets,
Expand All @@ -15,7 +18,6 @@ use zksync_default_da_clients::{
no_da::wiring_layer::NoDAClientWiringLayer,
object_store::{config::DAObjectStoreConfig, wiring_layer::ObjectStorageClientWiringLayer},
};
use via_da_clients::celestia::{config::ViaCelestiaConf, wiring_layer::ViaCelestiaClientWiringLayer};

use zksync_metadata_calculator::MetadataCalculatorConfig;
use zksync_node_api_server::{
Expand Down Expand Up @@ -452,7 +454,8 @@ impl MainNodeBuilder {

fn add_via_celestia_da_client_layer(mut self) -> anyhow::Result<Self> {
let config = ViaCelestiaConf::from_env()?;
self.node.add_layer(ViaCelestiaClientWiringLayer::new(config.0));
self.node
.add_layer(ViaCelestiaClientWiringLayer::new(config.0));
Ok(self)
}

Expand Down
4 changes: 2 additions & 2 deletions core/lib/config/src/configs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@ pub use self::{
general::GeneralConfig,
genesis::GenesisConfig,
object_store::ObjectStoreConfig,
via_celestia::ViaCelestiaConfig,
observability::{ObservabilityConfig, OpentelemetryConfig},
proof_data_handler::ProofDataHandlerConfig,
secrets::{DatabaseSecrets, L1Secrets, Secrets},
snapshots_creator::SnapshotsCreatorConfig,
utils::PrometheusConfig,
via_celestia::ViaCelestiaConfig,
vm_runner::ProtectiveReadsWriterConfig,
};

pub mod api;
pub mod chain;
pub mod via_celestia;
pub mod consensus;
pub mod contract_verifier;
pub mod contracts;
Expand All @@ -51,6 +50,7 @@ pub mod proof_data_handler;
pub mod secrets;
pub mod snapshots_creator;
pub mod utils;
pub mod via_celestia;
pub mod vm_runner;
pub mod wallets;

Expand Down
4 changes: 2 additions & 2 deletions core/lib/config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

pub use crate::configs::{
ApiConfig, ContractVerifierConfig, ContractsConfig, DADispatcherConfig, DBConfig, EthConfig,
EthWatchConfig, GasAdjusterConfig, GenesisConfig, ObjectStoreConfig, PostgresConfig,ViaCelestiaConfig,
SnapshotsCreatorConfig,
EthWatchConfig, GasAdjusterConfig, GenesisConfig, ObjectStoreConfig, PostgresConfig,
SnapshotsCreatorConfig, ViaCelestiaConfig,
};

pub mod configs;
Expand Down
2 changes: 1 addition & 1 deletion core/lib/env_config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use serde::de::DeserializeOwned;

mod api;
mod chain;
mod via_celestia;
mod contract_verifier;
mod contracts;
mod database;
Expand All @@ -21,6 +20,7 @@ mod observability;
mod proof_data_handler;
mod snapshots_creator;
mod utils;
mod via_celestia;

mod da_dispatcher;
mod genesis;
Expand Down
4 changes: 1 addition & 3 deletions core/lib/via_da_clients/src/celestia/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ use async_trait::async_trait;
use celestia_rpc::{BlobClient, Client};
use celestia_types::{blob::GasPrice, nmt::Namespace, Blob, Commitment};
use hex;
pub use zksync_da_client::{types, DataAvailabilityClient};
pub use zksync_config::ViaCelestiaConfig;
pub use zksync_da_client::{types, DataAvailabilityClient};

/// An implementation of the `DataAvailabilityClient` trait that stores the pubdata in the Celestia DA.
#[derive(Clone)]
Expand Down Expand Up @@ -131,5 +131,3 @@ impl Debug for CelestiaClient {
.finish()
}
}


1 change: 0 additions & 1 deletion core/lib/via_da_clients/src/celestia/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ impl ViaCelestiaConf {
Ok(Self(config))
}
}

1 change: 0 additions & 1 deletion core/lib/via_da_clients/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
pub mod celestia;

0 comments on commit 4478d65

Please sign in to comment.