From 3b2ea8fd405f17db856c0824f9358c56d17981a3 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Fri, 7 Sep 2018 09:32:22 -0600
Subject: [PATCH] Hoist untested branch in window

If there were unit tests for this function, the author would have
written it this way to make their own life easier.
---
 src/window.rs | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/window.rs b/src/window.rs
index 139fb36f09..2ea366f1e9 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -45,12 +45,9 @@ fn find_next_missing(
     recycler: &BlobRecycler,
     consumed: u64,
     received: u64,
-) -> Option<Vec<(SocketAddr, Vec<u8>)>> {
-    if received <= consumed {
-        return None;
-    }
+) -> Vec<(SocketAddr, Vec<u8>)> {
     let mut window = window.write().unwrap();
-    let reqs: Vec<_> = (consumed..received)
+    (consumed..received)
         .filter_map(|pix| {
             let i = (pix % WINDOW_SIZE) as usize;
 
@@ -70,8 +67,7 @@ fn find_next_missing(
             }
             None
         })
-        .collect();
-    Some(reqs)
+        .collect()
 }
 
 fn calculate_highest_lost_blob_index(num_peers: u64, consumed: u64, received: u64) -> u64 {
@@ -131,26 +127,28 @@ fn repair_window(
         consumed,
         received,
     );
-    if let Some(reqs) = find_next_missing(window, crdt, recycler, consumed, highest_lost) {
-        inc_new_counter_info!("streamer-repair_window-repair", reqs.len());
-        if log_enabled!(Level::Trace) {
-            trace!(
-                "{}: repair_window counter times: {} consumed: {} highest_lost: {} missing: {}",
-                id,
-                *times,
-                consumed,
-                highest_lost,
-                reqs.len()
-            );
 
-            for (to, _) in reqs.clone() {
-                trace!("{}: repair_window request to {}", id, to);
-            }
-        }
-        Some(reqs)
-    } else {
-        None
+    if received <= consumed {
+        return None;
     }
+
+    let reqs = find_next_missing(window, crdt, recycler, consumed, highest_lost);
+    inc_new_counter_info!("streamer-repair_window-repair", reqs.len());
+    if log_enabled!(Level::Trace) {
+        trace!(
+            "{}: repair_window counter times: {} consumed: {} highest_lost: {} missing: {}",
+            id,
+            *times,
+            consumed,
+            highest_lost,
+            reqs.len()
+        );
+
+        for (to, _) in reqs.clone() {
+            trace!("{}: repair_window request to {}", id, to);
+        }
+    }
+    Some(reqs)
 }
 
 fn add_block_to_retransmit_queue(