Remove double q

Author: Mechanix97

batcher/aligned-batcher/src/lib.rs

@@ -1064,7 +1064,7 @@ impl Batcher {
         if batch_state_lock.batch_queue.len() > self.max_batch_proof_qty {
             info!("Queue limit exceded, removing least priority element");
 
-            if let Some(lowest_priority_entry) = batch_state_lock.batch_queue.pop_min() {
+            if let Some(lowest_priority_entry) = batch_state_lock.batch_queue.pop() {
                 send_message(
                     lowest_priority_entry.0.messaging_sink.unwrap(),
                     SubmitProofResponseMessage::AddToBatchError,

batcher/aligned-batcher/src/types/batch_queue.rs

@@ -6,7 +6,7 @@ use aligned_sdk::{
     },
 };
 use ethers::types::{Address, Signature, U256};
-use priority_queue::DoublePriorityQueue;
+use priority_queue::PriorityQueue;
 use std::{
     hash::{Hash, Hasher},
     ops::ControlFlow,
@@ -119,7 +119,7 @@ impl Ord for BatchQueueEntryPriority {
     }
 }
 
-pub(crate) type BatchQueue = DoublePriorityQueue<BatchQueueEntry, BatchQueueEntryPriority>;
+pub(crate) type BatchQueue = PriorityQueue<BatchQueueEntry, BatchQueueEntryPriority>;
 
 /// Calculates the size of the batch represented by the given batch queue.
 pub(crate) fn calculate_batch_size(batch_queue: &BatchQueue) -> Result<usize, BatcherError> {
@@ -165,7 +165,7 @@ pub(crate) fn try_build_batch(
     let mut finalized_batch = batch_queue;
     let mut batch_size = calculate_batch_size(&finalized_batch)?;
 
-    while let Some((entry, _)) = finalized_batch.peek_max() {
+    while let Some((entry, _)) = finalized_batch.peek() {
         let batch_len = finalized_batch.len();
         let fee_per_proof = calculate_fee_per_proof(batch_len, gas_price, constant_gas_cost);
 
@@ -186,7 +186,7 @@ pub(crate) fn try_build_batch(
                     .len();
             batch_size -= verification_data_size;
 
-            finalized_batch.pop_max();
+            finalized_batch.pop();
 
             continue;
         }
@@ -201,7 +201,7 @@ pub(crate) fn try_build_batch(
         return Err(BatcherError::BatchCostTooHigh);
     }
 
-    Ok(finalized_batch.clone().into_descending_sorted_vec())
+    Ok(finalized_batch.clone().into_sorted_vec())
 }
 
 fn calculate_fee_per_proof(batch_len: usize, gas_price: U256, constant_gas_cost: u128) -> U256 {