simplify warm_quic_cache_service instantiation (#1063)

* simplify warm_quic_cache_service instantiation
solana-labs · Apr 26, 2024 · d87e23d · d87e23d
1 parent 67f21d9
commit d87e23d
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/core/src/tvu.rs b/core/src/tvu.rs
@@ -292,17 +292,19 @@ impl Tvu {
             tower_storage,
         );
 
-        let connection_cache_use_quic = connection_cache.map(|cc| cc.use_quic()).unwrap_or(false);
-        let warm_quic_cache_service = if connection_cache_use_quic {
-            Some(WarmQuicCacheService::new(
-                connection_cache.unwrap().clone(),
-                cluster_info.clone(),
-                poh_recorder.clone(),
-                exit.clone(),
-            ))
-        } else {
-            None
-        };
+        let warm_quic_cache_service = connection_cache.and_then(|connection_cache| {
+            if connection_cache.use_quic() {
+                Some(WarmQuicCacheService::new(
+                    connection_cache.clone(),
+                    cluster_info.clone(),
+                    poh_recorder.clone(),
+                    exit.clone(),
+                ))
+            } else {
+                None
+            }
+        });
+
         let (cost_update_sender, cost_update_receiver) = unbounded();
         let cost_update_service = CostUpdateService::new(blockstore.clone(), cost_update_receiver);