reduce nesting in track_new_blocks

breez · Nov 7, 2024 · c26c709 · c26c709
1 parent 2a6b750
commit c26c709
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/libs/sdk-core/src/breez_services.rs b/libs/sdk-core/src/breez_services.rs
@@ -1817,28 +1817,30 @@ impl BreezServices {
             interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
             loop {
                 tokio::select! {
-                    _ = interval.tick() => {
-                        let tip_res = cloned.chain_service.current_tip().await;
-                        match tip_res {
-                            Ok(next_block) => {
-                                debug!("got tip {:?}", next_block);
-                                if next_block > current_block {
-                                    _ = cloned.sync().await;
-                                    _ = cloned.on_event(BreezEvent::NewBlock{block: next_block}).await;
-                                }
-                                current_block = next_block
-                            },
-                            Err(e) => {
-                                error!("failed to fetch next block {}", e)
-                            }
-                        };
-                    }
+                    _ = interval.tick() => { }
 
                     _ = shutdown_receiver.changed() => {
                         debug!("New blocks task has completed");
                         return;
                     }
                 }
+
+                let next_block = match cloned.chain_service.current_tip().await {
+                    Ok(next_block) => next_block,
+                    Err(e) => {
+                        error!("failed to fetch next block {}", e);
+                        continue;
+                    }
+                };
+
+                debug!("got tip {:?}", next_block);
+                if next_block > current_block {
+                    _ = cloned.sync().await;
+                    _ = cloned
+                        .on_event(BreezEvent::NewBlock { block: next_block })
+                        .await;
+                }
+                current_block = next_block
             }
         });
     }