resolve conflicts: old metrics update style

anza-xyz · Mar 21, 2024 · 1fc684b · 1fc684b
1 parent d46d575
commit 1fc684b
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/core/src/banking_stage/transaction_scheduler/scheduler_controller.rs b/core/src/banking_stage/transaction_scheduler/scheduler_controller.rs
@@ -272,16 +272,8 @@ impl SchedulerController {
 
         let (received_packet_results, receive_time_us) = measure_us!(self
             .packet_receiver
-<<<<<<< HEAD
-            .receive_packets(recv_timeout, remaining_queue_capacity));
-        saturating_add_assign!(self.timing_metrics.receive_time_us, receive_time_us);
-=======
             .receive_packets(recv_timeout, remaining_queue_capacity, |_| true));
-
-        self.timing_metrics.update(|timing_metrics| {
-            saturating_add_assign!(timing_metrics.receive_time_us, receive_time_us);
-        });
->>>>>>> 5f1693224e (Discard packets statically known to fail (#370))
+        saturating_add_assign!(self.timing_metrics.receive_time_us, receive_time_us);
 
         match received_packet_results {
             Ok(receive_packet_results) => {