From 160e4b2ce7a7ab4ff70a4cae7644a3dd01cc25ee Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Fri, 11 Oct 2024 20:11:58 +0200
Subject: [PATCH] tx-pool: simplify `FinalizedBlockTracker` update logic
 (#11664)

---
 crates/transaction-pool/src/maintain.rs | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/crates/transaction-pool/src/maintain.rs b/crates/transaction-pool/src/maintain.rs
index 36c7067d4..aaf2d6d12 100644
--- a/crates/transaction-pool/src/maintain.rs
+++ b/crates/transaction-pool/src/maintain.rs
@@ -454,20 +454,11 @@ impl FinalizedBlockTracker {
 
     /// Updates the tracked finalized block and returns the new finalized block if it changed
     fn update(&mut self, finalized_block: Option<BlockNumber>) -> Option<BlockNumber> {
-        match (self.last_finalized_block, finalized_block) {
-            (Some(last), Some(finalized)) => {
-                self.last_finalized_block = Some(finalized);
-                if last < finalized {
-                    Some(finalized)
-                } else {
-                    None
-                }
-            }
-            (None, Some(finalized)) => {
-                self.last_finalized_block = Some(finalized);
-                Some(finalized)
-            }
-            _ => None,
+        let finalized = finalized_block?;
+        if self.last_finalized_block.replace(finalized).map_or(true, |last| last < finalized) {
+            Some(finalized)
+        } else {
+            None
         }
     }
 }