Support fractions in data amounts

fplus-lib/Cargo.toml

@@ -47,9 +47,10 @@ alloy = { git = "https://github.com/alloy-rs/alloy", version = "0.1.0", features
     "eip712",
 ] }
 tempfile = "3.10.1"
+size = "0.5.0-preview2"
 
 [dev-dependencies]
 actix-rt = "2.9.0"
 
 [features]
-online-tests = []
+online-tests = []

fplus-lib/src/helpers.rs

@@ -1,28 +1,9 @@
-use regex::Regex;
+use size::Size;
 
 pub fn parse_size_to_bytes(size: &str) -> Option<u64> {
-    let re = Regex::new(r"^(\d+)\s?([a-zA-Z]+)$").unwrap();
-    let caps = re.captures(size.trim())?;
-
-    let number = caps.get(1)?.as_str().parse::<u64>().ok()?;
-    let unit = caps.get(2)?.as_str().to_uppercase();
-
-    // Normalize the unit by removing any trailing 'i', 's' and converting to upper case
-    let normalized_unit = unit.trim_end_matches('S');
-
-    match normalized_unit {
-        "KIB" => Some(number * 1024),                             // 2^10
-        "MIB" => Some(number * 1024 * 1024),                      // 2^20
-        "GIB" => Some(number * 1024 * 1024 * 1024),               // 2^30
-        "TIB" => Some(number * 1024 * 1024 * 1024 * 1024),        // 2^40
-        "PIB" => Some(number * 1024 * 1024 * 1024 * 1024 * 1024), // 2^50
-        "KB" => Some(number * 1000),                              // 10^3
-        "MB" => Some(number * 1000 * 1000),                       // 10^6
-        "GB" => Some(number * 1000 * 1000 * 1000),                // 10^9
-        "TB" => Some(number * 1000 * 1000 * 1000 * 1000),         // 10^12
-        "PB" => Some(number * 1000 * 1000 * 1000 * 1000 * 1000),  // 10^15
-        _ => None,                                                // Unsupported unit
-    }
+    let size = Size::from_str(size).ok()?;
+    let bytes = size.bytes();
+    bytes.try_into().ok()
 }
 
 pub fn compare_allowance_and_allocation(
@@ -83,4 +64,16 @@ mod tests {
         let res = parse_size_to_bytes("2PiB");
         assert_eq!(res, Some(2251799813685248));
     }
+
+    #[test]
+    fn should_work_with_fractions() {
+        let res = parse_size_to_bytes("4.32PiB");
+        assert_eq!(res, Some(4863887597560136));
+    }
+
+    #[test]
+    fn should_work_with_fractions_with_space() {
+        let res = parse_size_to_bytes("4.32 PiB");
+        assert_eq!(res, Some(4863887597560136));
+    }
 }