Review fixes

Author: 0xMimir

p2p/src/network/yamux/p2p_network_yamux_reducer.rs

@@ -136,12 +136,12 @@ impl P2pNetworkYamuxState {
                 }
 
                 match &frame.inner {
-                    YamuxFrameInner::Data(data) => {
+                    YamuxFrameInner::Data(_) => {
                         if let Some(stream) = yamux_state.streams.get_mut(&frame.stream_id) {
                             // must not underflow
                             // TODO: check it and disconnect peer that violates flow rules
                             stream.window_ours =
-                                stream.window_ours.saturating_sub(data.len() as u32);
+                                stream.window_ours.saturating_sub(frame.len_as_u32());
                         }
                     }
                     YamuxFrameInner::WindowUpdate { difference } => {
@@ -157,7 +157,7 @@ impl P2pNetworkYamuxState {
                             // try send as many frames as can
                             let mut window = stream.window_theirs;
                             while let Some(frame) = stream.pending.pop_front() {
-                                let len = frame.len() as u32;
+                                let len = frame.len_as_u32();
                                 pending_outgoing.push_back(frame);
                                 if let Some(new_window) = window.checked_sub(len) {
                                     window = new_window;
@@ -285,9 +285,9 @@ impl P2pNetworkYamuxState {
                     return Ok(());
                 };
                 match &mut frame.inner {
-                    YamuxFrameInner::Data(data) => {
+                    YamuxFrameInner::Data(_) => {
                         if let Some(new_window) =
-                            stream.window_theirs.checked_sub(data.len() as u32)
+                            stream.window_theirs.checked_sub(frame.len_as_u32())
                         {
                             // their window is big enough, decrease the size
                             // and send the whole frame

p2p/src/network/yamux/p2p_network_yamux_state.rs

@@ -343,6 +343,15 @@ impl YamuxFrame {
         }
     }
 
+    // When we parse the frame we parse length as u32 and so `data.len()` should always be representable as u32
+    pub fn len_as_u32(&self) -> u32 {
+        if let YamuxFrameInner::Data(data) = &self.inner {
+            u32::try_from(data.len()).unwrap_or(u32::MAX)
+        } else {
+            0
+        }
+    }
+
     /// If this data is bigger then `pos`, keep only first `pos` bytes and return some remaining
     /// otherwise return none
     pub fn split_at(&mut self, pos: usize) -> Option<Self> {