fix large msg sending logic (#274)

* fix large msg sending logic

consensus-engine/src/overlay/tree_overlay/tree.rs

@@ -92,7 +92,10 @@ impl Tree {
         let Some(base) = self
             .committee_id_to_index
             .get(committee_id)
-            .map(|&idx| idx * 2) else { return (None, None); };
+            .map(|&idx| idx * 2)
+        else {
+            return (None, None);
+        };
         let first_child = base + 1;
         let second_child = base + 2;
         (

nomos-services/consensus/src/lib.rs

@@ -232,7 +232,10 @@ where
                     genesis_block,
                     leader_tally_settings.clone(),
                 )
-                    .await else { unreachable!() };
+                .await
+                else {
+                    unreachable!()
+                };
                 Event::ProposeBlock { qc }
             });
         }
@@ -442,13 +445,12 @@ where
 
         if carnot.is_next_leader() {
             task_manager.push(block.view, async move {
-                let Event::Approve { qc, .. } = Self::gather_votes(
+                let Event::Approve { qc, .. } =
-                    adapter,
+                    Self::gather_votes(adapter, leader_committee, block, leader_tally_settings)
-                    leader_committee,
+                        .await
-                    block,
+                else {
-                    leader_tally_settings,
+                    unreachable!()
-                )
+                };
-                .await else { unreachable!() };
                 Event::ProposeBlock { qc }
             });
         }

simulations/src/bin/app/main.rs

@@ -82,12 +82,13 @@ impl SimulationApp {
                 let (node_message_sender, node_message_receiver) = channel::unbounded();
                 // Dividing milliseconds in second by milliseconds in the step.
                 let step_time_as_second_fraction =
-                    1_000_000 / simulation_settings.step_time.subsec_millis();
+                    simulation_settings.step_time.subsec_millis() as f32 / 1_000_000_f32;
-                let capacity_bps = simulation_settings.node_settings.network_capacity_kbps * 1024
+                let capacity_bps = simulation_settings.node_settings.network_capacity_kbps as f32
-                    / step_time_as_second_fraction;
+                    * 1024.0
+                    * step_time_as_second_fraction;
                 let network_message_receiver = network.connect(
                     node_id,
-                    capacity_bps,
+                    capacity_bps as u32,
                     node_message_receiver,
                     node_message_broadcast_receiver,
                 );

simulations/src/network/mod.rs

@@ -3,7 +3,10 @@ use std::{
     collections::HashMap,
     ops::Add,
     str::FromStr,
-    sync::atomic::{AtomicU32, Ordering},
+    sync::{
+        atomic::{AtomicU32, Ordering},
+        Arc,
+    },
     time::{Duration, Instant},
 };
 // crates
@@ -267,21 +270,48 @@ where
         let to = message.to.expect("adhoc message has recipient");
         if let Some(delay) = self.send_message_cost(rng, message.from, to) {
             let node_capacity = self.node_network_capacity.get(&to).unwrap();
-            if network_time.add(delay) <= self.network_time
+            let should_delay = network_time.add(delay) <= self.network_time;
-                && node_capacity.increase_load(message.size_bytes)
+            let remaining_size = message.remaining_size();
-            {
+            if should_delay && node_capacity.increase_load(remaining_size) {
                 let to_node = self.to_node_senders.get(&to).unwrap();
                 to_node
                     .send(message.clone())
                     .expect("node should have connection");
-                node_capacity.decrease_load(message.size_bytes);
+                node_capacity.decrease_load(remaining_size);
                 return false;
             } else {
+                // if we do not need to delay, then we should check if the msg is too large
+                // if so, we mock the partial sending message behavior
+                if should_delay {
+                    // if remaining is 0, we should send without delay
+                    return self.try_partial_send(node_capacity, message, &to) != 0;
+                }
                 return true;
             }
         }
         false
     }
+
+    /// Try to apply partial send logic, returns the remaining size of the message
+    fn try_partial_send(
+        &self,
+        node_capacity: &NodeNetworkCapacity,
+        message: &NetworkMessage<M>,
+        to: &NodeId,
+    ) -> u32 {
+        let mut cap = node_capacity.current_load.lock();
+        let sent = node_capacity.capacity_bps - *cap;
+        *cap = node_capacity.capacity_bps;
+        let remaining = message.partial_send(sent);
+        if remaining == 0 {
+            let to_node = self.to_node_senders.get(to).unwrap();
+            to_node
+                .send(message.clone())
+                .expect("node should have connection");
+            node_capacity.decrease_load(sent);
+        }
+        remaining
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -289,7 +319,7 @@ pub struct NetworkMessage<M> {
     pub from: NodeId,
     pub to: Option<NodeId>,
     pub payload: M,
-    pub size_bytes: u32,
+    pub remaining: Arc<AtomicU32>,
 }
 
 impl<M> NetworkMessage<M> {
@@ -298,13 +328,28 @@ impl<M> NetworkMessage<M> {
             from,
             to,
             payload,
-            size_bytes,
+            remaining: Arc::new(AtomicU32::new(size_bytes)),
         }
     }
 
-    pub fn get_payload(self) -> M {
+    pub fn payload(&self) -> &M {
+        &self.payload
+    }
+
+    pub fn into_payload(self) -> M {
         self.payload
     }
+
+    fn remaining_size(&self) -> u32 {
+        self.remaining.load(Ordering::SeqCst)
+    }
+
+    /// Mock the partial sending of a message behavior, returning the remaining message size.
+    fn partial_send(&self, size: u32) -> u32 {
+        self.remaining
+            .fetch_sub(size, Ordering::SeqCst)
+            .saturating_sub(size)
+    }
 }
 
 pub trait PayloadSize {

simulations/src/network/regions.rs

@@ -208,7 +208,7 @@ mod tests {
                 .map(NodeId::from_index)
                 .collect::<Vec<NodeId>>();
 
-            let available_regions = vec![
+            let available_regions = [
                 Region::NorthAmerica,
                 Region::Europe,
                 Region::Asia,

simulations/src/node/carnot/message_cache.rs

@@ -1,6 +1,6 @@
 use crate::node::carnot::messages::CarnotMessage;
 use consensus_engine::View;
-use polars::export::ahash::HashMap;
+use std::collections::HashMap;
 
 pub(crate) struct MessageCache {
     cache: HashMap<View, Vec<CarnotMessage>>,

simulations/src/node/carnot/mod.rs

@@ -505,7 +505,7 @@ impl<L: UpdateableLeaderSelection, O: Overlay<LeaderSelection = L>> Node for Car
             .network_interface
             .receive_messages()
             .into_iter()
-            .map(NetworkMessage::get_payload)
+            .map(NetworkMessage::into_payload)
             .partition(|m| {
                 m.view() == self.engine.current_view()
                     || matches!(m, CarnotMessage::Proposal(_) | CarnotMessage::TimeoutQc(_))