refactor: use requesting only in ravable_total_fee

gusinacio · gusinacio · commit f2095ddcd127 · 2024-11-01T13:36:18.000-06:00
Signed-off-by: Gustavo Inacio &lt;gustavo@semiotic.ai&gt;
diff --git a/tap-agent/src/tracker/generic_tracker.rs b/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 {
diff --git a/tap-agent/src/tracker/global_tracker.rs b/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) {

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,9 @@ impl GenericTracker<GlobalFeeTracker, SenderFeeStats, DurationInfo, Unaggregated`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`pub fn get_ravable_total_fee(&mut self) -> u128 {`
`146`		`- self.get_total_fee() - self.get_buffered_fee().min(self.global.total_fee)`
	`146`	`+ self.get_total_fee()`
	`147`	`+ - self.global.requesting`
	`148`	`+ - self.get_buffered_fee().min(self.global.total_fee)`
`147`	`149`	`}`
`148`	`150`
`149`	`151`	`fn get_buffered_fee(&mut self) -> u128 {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ impl GlobalTracker<u128> for u128 {`
`22`	`22`
`23`	`23`	`impl GlobalTracker<UnaggregatedReceipts> for GlobalFeeTracker {`
`24`	`24`	`fn get_total_fee(&self) -> u128 {`
`25`		`- self.total_fee - self.requesting`
	`25`	`+ self.total_fee`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`fn update(&mut self, new_fee: u128) {`