fix rebase conflict

cronos-labs · May 29, 2024 · 6b9dcc6 · 6b9dcc6
1 parent 0fee2d3
commit 6b9dcc6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/core/lib/zksync_core/src/lib.rs b/core/lib/zksync_core/src/lib.rs
@@ -12,7 +12,6 @@ use anyhow::Context as _;
 use api_server::tx_sender::{
     deny_list_pool_sink::DenyListPoolSink, master_pool_sink::MasterPoolSink,
 };
-use fee_model::{ApiFeeInputProvider, BatchFeeModelInputProvider, MainNodeFeeInputProvider};
 use prometheus_exporter::PrometheusExporterConfig;
 use prover_dal::Prover;
 use temp_config_store::Secrets;

diff --git a/core/node/node_framework/src/implementations/layers/web3_api/tx_sink.rs b/core/node/node_framework/src/implementations/layers/web3_api/tx_sink.rs
@@ -45,7 +45,7 @@ impl WiringLayer for TxSinkLayer {
             }
             TxSinkLayer::DenyListPoolSink { deny_list } => {
                 let pool = context
-                    .get_resource::<MasterPoolResource>()
+                    .get_resource::<PoolResource<MasterPool>>()
                     .await?
                     .get()
                     .await?;