refactor: use requesting only in ravable_total_fee

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

tap-agent/src/tracker/generic_tracker.rs

@@ -143,7 +143,9 @@ impl GenericTracker<GlobalFeeTracker, SenderFeeStats, DurationInfo, Unaggregated
     }
 
     pub fn get_ravable_total_fee(&mut self) -> u128 {
-        self.get_total_fee() - self.get_buffered_fee().min(self.global.total_fee)
+        self.get_total_fee()
+            - self.global.requesting
+            - self.get_buffered_fee().min(self.global.total_fee)
     }
 
     fn get_buffered_fee(&mut self) -> u128 {

tap-agent/src/tracker/global_tracker.rs

@@ -22,7 +22,7 @@ impl GlobalTracker<u128> for u128 {
 
 impl GlobalTracker<UnaggregatedReceipts> for GlobalFeeTracker {
     fn get_total_fee(&self) -> u128 {
-        self.total_fee - self.requesting
+        self.total_fee
     }
 
     fn update(&mut self, new_fee: u128) {

tap-agent/src/tracker/tracker_tests.rs

@@ -265,13 +265,13 @@ fn test_ongoing_rav_requests() {
     tracker.start_rav_request(allocation_id_2);
 
     assert_eq!(tracker.get_heaviest_allocation_id(), Some(allocation_id_1));
-    assert_eq!(tracker.get_total_fee(), 30);
+    assert_eq!(tracker.get_total_fee(), 60);
     assert_eq!(tracker.get_ravable_total_fee(), 30);
 
     tracker.add(allocation_id_2, 1, get_current_timestamp_u64_ns());
 
     assert_eq!(tracker.get_heaviest_allocation_id(), Some(allocation_id_1));
-    assert_eq!(tracker.get_total_fee(), 31);
+    assert_eq!(tracker.get_total_fee(), 61);
     assert_eq!(tracker.get_ravable_total_fee(), 31);
 
     tracker.finish_rav_request(allocation_id_2);