From 1c379fa0db28faff449379d6c796f5940b3e62db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Tue, 22 Nov 2022 11:49:35 +0100
Subject: [PATCH] WIP

---
 .../network-requester/src/core.rs             | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/service-providers/network-requester/src/core.rs b/service-providers/network-requester/src/core.rs
index 496aef01b5..70bef919a0 100644
--- a/service-providers/network-requester/src/core.rs
+++ b/service-providers/network-requester/src/core.rs
@@ -117,6 +117,20 @@ impl ServiceProvider {
         }
     }
 
+    fn handle_lane_queue_length_response(
+        lane_queue_lengths: &LaneQueueLengths,
+        lane: u64,
+        queue_length: usize,
+    ) {
+        log::info!("received LaneQueueLength lane: {lane}, queue_length: {queue_length}");
+        if let Ok(mut lane_queue_lengths) = lane_queue_lengths.lock() {
+            let lane = TransmissionLane::ConnectionId(lane);
+            lane_queue_lengths.map.insert(lane, queue_length);
+        } else {
+            log::warn!("Unable to lock lane queue lengths, skipping updating received lane length")
+        }
+    }
+
     async fn read_websocket_message(
         websocket_reader: &mut SplitStream<TSWebsocketStream>,
         lane_queue_lengths: LaneQueueLengths,
@@ -141,15 +155,11 @@ impl ServiceProvider {
             let received = match deserialized_message {
                 ServerResponse::Received(received) => received,
                 ServerResponse::LaneQueueLength(lane, queue_length) => {
-                    log::info!(
-                        "received LaneQueueLength lane: {lane}, queue_length: {queue_length}"
+                    Self::handle_lane_queue_length_response(
+                        &lane_queue_lengths,
+                        lane,
+                        queue_length,
                     );
-                    if let Ok(mut lane_queue_lengths) = lane_queue_lengths.lock() {
-                        let lane = TransmissionLane::ConnectionId(lane);
-                        lane_queue_lengths.map.insert(lane, queue_length);
-                    } else {
-                        log::warn!("Unable to lock lane queue lengths, skipping updating received lane length")
-                    }
                     continue;
                 }
                 ServerResponse::Error(err) => {