Merge pull request #3070 from ermineJose/armv7-storage-size-LP

feat: change data type from usize to u64 id disk space for nodes

Author: maqi

node-launchpad/src/components/popup/manage_nodes.rs

@@ -23,9 +23,9 @@ use crate::{
 
 use super::super::{Component, utils::centered_rect_fixed};
 
-pub const GB_PER_NODE: usize = 35;
-pub const MB: usize = 1000 * 1000;
-pub const GB: usize = MB * 1000;
+pub const GB_PER_NODE: u64 = 35;
+pub const MB: u64 = 1000 * 1000;
+pub const GB: u64 = MB * 1000;
 pub const MAX_NODE_COUNT: usize = 50;
 
 pub struct ManageNodes {
@@ -43,7 +43,7 @@ impl ManageNodes {
         let nodes_to_start = std::cmp::min(nodes_to_start, MAX_NODE_COUNT);
         let new = Self {
             active: false,
-            available_disk_space_gb: get_available_space_b(&storage_mountpoint)? / GB,
+            available_disk_space_gb: (get_available_space_b(&storage_mountpoint)? / GB) as usize,
             nodes_to_start_input: Input::default().with_value(nodes_to_start.to_string()),
             old_value: Default::default(),
             storage_mountpoint: storage_mountpoint.clone(),
@@ -58,7 +58,10 @@ impl ManageNodes {
     // Returns the max number of nodes to start
     // It is the minimum of the available disk space and the max nodes limit
     fn max_nodes_to_start(&self) -> usize {
-        std::cmp::min(self.available_disk_space_gb / GB_PER_NODE, MAX_NODE_COUNT)
+        std::cmp::min(
+            self.available_disk_space_gb / GB_PER_NODE as usize,
+            MAX_NODE_COUNT,
+        )
     }
 }
 
@@ -111,7 +114,7 @@ impl Component for ManageNodes {
                     .parse::<usize>()
                     .unwrap_or(0);
                 // if it might exceed the available space or if more than max_node_count, then enter the max
-                if new_value * GB_PER_NODE > self.available_disk_space_gb
+                if (new_value as u64) * GB_PER_NODE > (self.available_disk_space_gb as u64) * GB
                     || new_value > MAX_NODE_COUNT
                 {
                     self.nodes_to_start_input = self
@@ -134,7 +137,9 @@ impl Component for ManageNodes {
                     if key.code == KeyCode::Up {
                         if current_val + 1 >= MAX_NODE_COUNT {
                             MAX_NODE_COUNT
-                        } else if (current_val + 1) * GB_PER_NODE <= self.available_disk_space_gb {
+                        } else if ((current_val + 1) as u64) * GB_PER_NODE
+                            <= (self.available_disk_space_gb as u64) * GB
+                        {
                             current_val + 1
                         } else {
                             current_val
@@ -179,7 +184,7 @@ impl Component for ManageNodes {
             },
             Action::OptionsActions(OptionsActions::UpdateStorageDrive(mountpoint, _drive_name)) => {
                 self.storage_mountpoint.clone_from(&mountpoint);
-                self.available_disk_space_gb = get_available_space_b(&mountpoint)? / GB;
+                self.available_disk_space_gb = (get_available_space_b(&mountpoint)? / GB) as usize;
                 None
             }
             _ => None,
@@ -266,7 +271,10 @@ impl Component for ManageNodes {
         let info = Line::from(vec![
             Span::styled("Using", info_style),
             Span::styled(
-                format!(" {}GB ", self.get_nodes_to_start_val() * GB_PER_NODE),
+                format!(
+                    " {}GB ",
+                    (self.get_nodes_to_start_val() as u64) * GB_PER_NODE
+                ),
                 info_style.bold(),
             ),
             Span::styled(
@@ -319,4 +327,4 @@ impl Component for ManageNodes {
 
         Ok(())
     }
-}
+}

node-launchpad/src/components/status.rs

@@ -156,7 +156,8 @@ impl Status<'_> {
             port_to: config.port_to,
             error_popup: None,
             storage_mountpoint: config.storage_mountpoint.clone(),
-            available_disk_space_gb: get_available_space_b(&config.storage_mountpoint)? / GB,
+            available_disk_space_gb: (get_available_space_b(&config.storage_mountpoint)? / GB)
+                as usize,
         };
 
         // Nodes registry
@@ -924,7 +925,7 @@ impl Component for Status<'_> {
                     debug!("Got action to Add node");
 
                     // Validations - Available space
-                    if GB_PER_NODE > self.available_disk_space_gb {
+                    if (GB_PER_NODE as usize) > self.available_disk_space_gb {
                         self.error_popup = Some(ErrorPopup::new(
                             "Cannot Add Node".to_string(),
                             format!("\nEach Node requires {GB_PER_NODE}GB of available space."),
@@ -1106,7 +1107,7 @@ impl Component for Status<'_> {
             }
             Action::OptionsActions(OptionsActions::UpdateStorageDrive(mountpoint, _drive_name)) => {
                 self.storage_mountpoint.clone_from(&mountpoint);
-                self.available_disk_space_gb = get_available_space_b(&mountpoint)? / GB;
+                self.available_disk_space_gb = (get_available_space_b(&mountpoint)? / GB) as usize;
             }
             _ => {}
         }
@@ -1155,7 +1156,7 @@ impl Component for Status<'_> {
 
         let storage_allocated_row = Row::new(vec![
             Cell::new("Storage Allocated".to_string()).fg(GHOST_WHITE),
-            Cell::new(format!("{} GB", self.nodes_to_start * GB_PER_NODE)).fg(GHOST_WHITE),
+            Cell::new(format!("{} GB", (self.nodes_to_start as u64) * GB_PER_NODE)).fg(GHOST_WHITE),
         ]);
         let memory_use_val = if self.node_stats.total_memory_usage_mb as f64 / 1024_f64 > 1.0 {
             format!(

node-launchpad/src/system.rs

@@ -139,7 +139,7 @@ pub fn get_primary_mount_point_name() -> Result<String> {
 }
 
 // Gets available disk space in bytes for the given mountpoint
-pub fn get_available_space_b(storage_mountpoint: &PathBuf) -> Result<usize> {
+pub fn get_available_space_b(storage_mountpoint: &PathBuf) -> Result<u64> {
     let disks = Disks::new_with_refreshed_list();
     if tracing::level_enabled!(tracing::Level::DEBUG) {
         for disk in disks.list() {
@@ -156,7 +156,7 @@ pub fn get_available_space_b(storage_mountpoint: &PathBuf) -> Result<usize> {
         .iter()
         .find(|disk| disk.mount_point() == storage_mountpoint)
         .context("Cannot find the primary disk. Configuration file might be wrong.")?
-        .available_space() as usize;
+        .available_space();
 
     Ok(available_space_b)
 }