From 3660a5c40428fba35c92f5ce3df5122eb66f9578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Blankfors?= <marten@blankfors.se>
Date: Thu, 10 Oct 2024 08:59:49 +0200
Subject: [PATCH] refactor: Eager returns in txpool_v2::service::Task::run
 (#2325)

---
 crates/services/txpool_v2/src/service.rs | 32 +++++++++++-------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/crates/services/txpool_v2/src/service.rs b/crates/services/txpool_v2/src/service.rs
index 61fea49aea2..b59f3360049 100644
--- a/crates/services/txpool_v2/src/service.rs
+++ b/crates/services/txpool_v2/src/service.rs
@@ -217,44 +217,42 @@ where
     View: TxPoolPersistentStorage,
 {
     async fn run(&mut self, watcher: &mut StateWatcher) -> anyhow::Result<bool> {
-        let should_continue;
-
         tokio::select! {
             biased;
 
             _ = watcher.while_started() => {
-                should_continue = false;
+                return Ok(false)
             }
 
             block_result = self.subscriptions.imported_blocks.next() => {
                 if let Some(result) = block_result {
                     self.import_block(result);
-                    should_continue = true;
+                    return Ok(true)
                 } else {
-                    should_continue = false;
+                    return Ok(false)
                 }
             }
 
             select_transaction_request = self.subscriptions.borrow_txpool.recv() => {
                 if let Some(select_transaction_request) = select_transaction_request {
                     self.borrow_txpool(select_transaction_request);
-                    should_continue = true;
+                    return Ok(true)
                 } else {
-                    should_continue = false;
+                    return Ok(false)
                 }
             }
 
             _ = self.pruner.ttl_timer.tick() => {
                 self.try_prune_transactions();
-                should_continue = true;
+                return Ok(true)
             }
 
             write_pool_request = self.subscriptions.write_pool.recv() => {
                 if let Some(write_pool_request) = write_pool_request {
                     self.process_write(write_pool_request);
-                    should_continue = true;
+                    return Ok(true)
                 } else {
-                    should_continue = false;
+                    return Ok(false)
                 }
             }
 
@@ -263,32 +261,30 @@ where
                     if let Some(tx) = data {
                         self.manage_tx_from_p2p(tx, message_id, peer_id);
                     }
-                    should_continue = true;
+                    return Ok(true)
                 } else {
-                    should_continue = false;
+                    return Ok(false)
                 }
             }
 
             new_peer_subscribed = self.subscriptions.new_tx_source.next() => {
                 if let Some(peer_id) = new_peer_subscribed {
                     self.manage_new_peer_subscribed(peer_id);
-                    should_continue = true;
+                    return Ok(true)
                 } else {
-                    should_continue = false;
+                    return Ok(false)
                 }
             }
 
             read_pool_request = self.subscriptions.read_pool.recv() => {
                 if let Some(read_pool_request) = read_pool_request {
                     self.process_read(read_pool_request);
-                    should_continue = true;
+                    return Ok(true)
                 } else {
-                    should_continue = false;
+                    return Ok(false)
                 }
             }
         }
-
-        Ok(should_continue)
     }
 
     async fn shutdown(self) -> anyhow::Result<()> {