@@ -657,41 +657,33 @@ impl Actor for SenderAccount {
657657
658658 let has_available_slots_for_requests = state. adaptive_limiter . has_limit ( ) ;
659659 if has_available_slots_for_requests {
660- let rav_result = if !state. backoff_info . in_backoff ( ) {
661- let total_fee_outside_buffer =
662- state. sender_fee_tracker . get_ravable_total_fee ( ) ;
663- let total_fee_greater_trigger_value =
664- total_fee_outside_buffer >= state. config . tap . rav_request_trigger_value ;
660+ let total_fee_outside_buffer = state. sender_fee_tracker . get_ravable_total_fee ( ) ;
661+ let total_counter_for_allocation = state
662+ . sender_fee_tracker
663+ . get_count_outside_buffer_for_allocation ( & allocation_id) ;
664+ let can_trigger_rav = state. sender_fee_tracker . can_trigger_rav ( allocation_id) ;
665+ let counter_greater_receipt_limit = total_counter_for_allocation
666+ >= state. config . tap . rav_request_receipt_limit
667+ && can_trigger_rav;
668+ let rav_result = if !state. backoff_info . in_backoff ( )
669+ && total_fee_outside_buffer >= state. config . tap . rav_request_trigger_value
670+ {
665671 tracing:: debug!(
666672 total_fee_outside_buffer,
667673 trigger_value = state. config. tap. rav_request_trigger_value,
668674 "Total fee greater than the trigger value. Triggering RAV request"
669675 ) ;
670- if total_fee_greater_trigger_value {
671- state. rav_request_for_heaviest_allocation ( ) . await
672- } else {
673- Ok ( ( ) )
674- }
675- } else {
676- let total_counter_for_allocation = state
677- . sender_fee_tracker
678- . get_count_outside_buffer_for_allocation ( & allocation_id) ;
679- let can_trigger_rav =
680- state. sender_fee_tracker . can_trigger_rav ( allocation_id) ;
681- let counter_greater_receipt_limit = total_counter_for_allocation
682- >= state. config . tap . rav_request_receipt_limit
683- && can_trigger_rav;
676+ state. rav_request_for_heaviest_allocation ( ) . await
677+ } else if counter_greater_receipt_limit {
684678 tracing:: debug!(
685679 total_counter_for_allocation,
686680 rav_request_receipt_limit = state. config. tap. rav_request_receipt_limit,
687681 %allocation_id,
688682 "Total counter greater than the receipt limit per rav. Triggering RAV request"
689683 ) ;
690- if counter_greater_receipt_limit {
691- state. rav_request_for_allocation ( allocation_id) . await
692- } else {
693- Ok ( ( ) )
694- }
684+ state. rav_request_for_allocation ( allocation_id) . await
685+ } else {
686+ Ok ( ( ) )
695687 } ;
696688 // In case we fail, we want our actor to keep running
697689 if let Err ( err) = rav_result {
0 commit comments