Skip to content

Commit e7783a5

Browse files
committed
update: fix fmt
1 parent cf10193 commit e7783a5

File tree

9 files changed

+46
-43
lines changed

9 files changed

+46
-43
lines changed

madara/crates/client/gateway/client/src/health.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
///
33
/// This module provides gateway-specific health monitoring by wrapping the generic
44
/// mp-resilience ConnectionHealth with gateway-specific context.
5-
65
use mp_resilience::ConnectionHealth;
76
use std::sync::Arc;
87
use tokio::sync::RwLock;

madara/crates/client/gateway/client/src/retry.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
///
33
/// This module wraps the generic mp-resilience retry logic with gateway-specific
44
/// error type handling for SequencerError.
5-
65
use mp_gateway::error::{SequencerError, StarknetErrorCode};
76
use std::time::Duration;
87

madara/crates/client/settlement_client/src/eth/mod.rs

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ impl SettlementLayerProvider for EthereumClient {
179179
logs.into_iter().rev().map(|log| log.log_decode::<StarknetCoreContract::LogStateUpdate>()).next();
180180

181181
match latest_logs {
182-
Some(Ok(log)) => log
183-
.block_number
184-
.ok_or_else(|| -> SettlementClientError { EthereumClientError::MissingField("block_number").into() }),
182+
Some(Ok(log)) => log.block_number.ok_or_else(|| -> SettlementClientError {
183+
EthereumClientError::MissingField("block_number").into()
184+
}),
185185
Some(Err(e)) => Err(SettlementClientError::Ethereum(EthereumClientError::Contract(e.to_string()))),
186186
None => Err(SettlementClientError::Ethereum(EthereumClientError::EventProcessing {
187187
message: format!("no LogStateUpdate event found in block range [None, {}]", latest_block),
@@ -263,18 +263,20 @@ impl SettlementLayerProvider for EthereumClient {
263263
// Try to create the event stream with retry logic
264264
let event_filter = self.l1_core_contract.event_filter::<StarknetCoreContract::LogStateUpdate>();
265265

266-
let event_stream_result = ctx.run_until_cancelled(async {
267-
self.retry_l1_call("watch_events", || async {
268-
event_filter.watch().await.map_err(|e| -> SettlementClientError {
269-
EthereumClientError::EventStream { message: format!("Failed to watch events: {}", e) }.into()
266+
let event_stream_result = ctx
267+
.run_until_cancelled(async {
268+
self.retry_l1_call("watch_events", || async {
269+
event_filter.watch().await.map_err(|e| -> SettlementClientError {
270+
EthereumClientError::EventStream { message: format!("Failed to watch events: {}", e) }
271+
.into()
272+
})
270273
})
271-
}).await
272-
}).await;
274+
.await
275+
})
276+
.await;
273277

274278
let mut event_stream = match event_stream_result {
275-
Some(Ok(stream)) => {
276-
stream.into_stream()
277-
},
279+
Some(Ok(stream)) => stream.into_stream(),
278280
Some(Err(e)) => {
279281
// This shouldn't happen since retry_l1_call has infinite retry,
280282
// but handle it just in case
@@ -474,18 +476,20 @@ impl SettlementLayerProvider for EthereumClient {
474476
) -> Result<BoxStream<'static, Result<MessageToL2WithMetadata, SettlementClientError>>, SettlementClientError> {
475477
// Wrap the watch call with retry logic to handle L1 being down
476478
// Note: We need to recreate the filter inside the closure to avoid move issues
477-
let event_stream = self.retry_l1_call("watch_message_events", || async {
478-
let filter = self.l1_core_contract.event_filter::<LogMessageToL2>();
479-
filter.from_block(from_l1_block_n).to_block(BlockNumberOrTag::Finalized).watch().await.map_err(
480-
|e| -> SettlementClientError {
481-
EthereumClientError::ArchiveRequired(format!(
482-
"Could not fetch events, archive node may be required: {}",
483-
e
484-
))
485-
.into()
486-
},
487-
)
488-
}).await?;
479+
let event_stream = self
480+
.retry_l1_call("watch_message_events", || async {
481+
let filter = self.l1_core_contract.event_filter::<LogMessageToL2>();
482+
filter.from_block(from_l1_block_n).to_block(BlockNumberOrTag::Finalized).watch().await.map_err(
483+
|e| -> SettlementClientError {
484+
EthereumClientError::ArchiveRequired(format!(
485+
"Could not fetch events, archive node may be required: {}",
486+
e
487+
))
488+
.into()
489+
},
490+
)
491+
})
492+
.await?;
489493

490494
Ok(EthereumEventStream::new(event_stream).boxed())
491495
}
@@ -645,14 +649,14 @@ mod l1_messaging_tests {
645649
transports::http::{Client, Http},
646650
};
647651
use mc_db::MadaraBackend;
648-
use mp_resilience::ConnectionHealth;
649-
use tokio::sync::RwLock;
650652
use mp_chain_config::ChainConfig;
653+
use mp_resilience::ConnectionHealth;
651654
use mp_transactions::{L1HandlerTransaction, L1HandlerTransactionWithFee};
652655
use mp_utils::service::ServiceContext;
653656
use rstest::*;
654657
use starknet_types_core::felt::Felt;
655658
use std::{sync::Arc, time::Duration};
659+
use tokio::sync::RwLock;
656660
use tracing_test::traced_test;
657661
use url::Url;
658662

madara/crates/client/settlement_client/src/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,11 @@ pub struct L1ClientImpl {
191191
}
192192

193193
impl L1ClientImpl {
194-
fn new(backend: Arc<MadaraBackend>, provider: Arc<dyn SettlementLayerProvider>, health: Arc<RwLock<ConnectionHealth>>) -> Self {
194+
fn new(
195+
backend: Arc<MadaraBackend>,
196+
provider: Arc<dyn SettlementLayerProvider>,
197+
health: Arc<RwLock<ConnectionHealth>>,
198+
) -> Self {
195199
Self { provider, backend, notify_new_message_to_l2: Default::default(), health }
196200
}
197201

madara/crates/client/settlement_client/src/messaging.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,13 @@ pub async fn sync(
8383

8484
// Infinite retry loop for message syncing
8585
loop {
86-
let result = ctx.run_until_cancelled(sync_inner(
87-
Arc::clone(&settlement_client),
88-
Arc::clone(&backend),
89-
Arc::clone(&notify_consumer),
90-
)).await;
86+
let result = ctx
87+
.run_until_cancelled(sync_inner(
88+
Arc::clone(&settlement_client),
89+
Arc::clone(&backend),
90+
Arc::clone(&notify_consumer),
91+
))
92+
.await;
9193

9294
match result {
9395
Some(Ok(())) => {

madara/crates/primitives/resilience/src/health.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ impl ConnectionHealth {
237237
}
238238

239239
// Standard recovery: enough attempts with low failure rate
240-
self.recovery_attempts >= RECOVERY_ATTEMPTS_THRESHOLD
241-
&& self.failure_rate() < FAILURE_RATE_HEALTHY_THRESHOLD
240+
self.recovery_attempts >= RECOVERY_ATTEMPTS_THRESHOLD && self.failure_rate() < FAILURE_RATE_HEALTHY_THRESHOLD
242241
}
243242

244243
/// Calculate current failure rate

madara/crates/primitives/resilience/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@
3434
/// }
3535
/// }
3636
/// ```
37-
3837
pub mod health;
3938
pub mod retry;
4039

4140
// Re-export main types for convenience
42-
pub use health::{ConnectionHealth, HealthState, start_health_monitor};
41+
pub use health::{start_health_monitor, ConnectionHealth, HealthState};
4342
pub use retry::{RetryConfig, RetryPhase, RetryState};

madara/crates/primitives/resilience/src/retry.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,7 @@ pub struct RetryState {
104104

105105
impl std::fmt::Debug for RetryState {
106106
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
107-
f.debug_struct("RetryState")
108-
.field("config", &self.config)
109-
.field("retry_count", &self.retry_count)
110-
.finish()
107+
f.debug_struct("RetryState").field("config", &self.config).field("retry_count", &self.retry_count).finish()
111108
}
112109
}
113110

madara/node/src/service/l2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl Service for SyncService {
7575
// TODO(heemankv, 2025-10-26): all_verifications_disabled should be configured from the env
7676
BlockValidationConfig::default()
7777
.trust_parent_hash(this.unsafe_starting_block_enabled)
78-
.trust_state_root(this.unsafe_starting_block_enabled)
78+
.trust_state_root(this.unsafe_starting_block_enabled),
7979
));
8080

8181
let config = SyncControllerConfig::default()

0 commit comments

Comments
 (0)