chore: give dynamic compositiabillity for mempool

Author: rayyan224

crates/account-abstraction-core/src/domain/mempool.rs

@@ -9,7 +9,7 @@ pub struct PoolConfig {
 pub trait Mempool: Send + Sync {
     fn add_operation(&mut self, operation: &WrappedUserOperation) -> Result<(), anyhow::Error>;
 
-    fn get_top_operations(&self, n: usize) -> impl Iterator<Item = Arc<WrappedUserOperation>>;
+    fn get_top_operations(&self, n: usize) -> Vec<Arc<WrappedUserOperation>>;
 
     fn remove_operation(
         &mut self,

crates/account-abstraction-core/src/infrastructure/in_memory/mempool.rs

@@ -101,7 +101,7 @@ impl Mempool for InMemoryMempool {
         Ok(())
     }
 
-    fn get_top_operations(&self, n: usize) -> impl Iterator<Item = Arc<WrappedUserOperation>> {
+    fn get_top_operations(&self, n: usize) -> Vec<Arc<WrappedUserOperation>> {
         self.best
             .iter()
             .filter_map(|op_by_fee| {
@@ -127,6 +127,7 @@ impl Mempool for InMemoryMempool {
                 }
             })
             .take(n)
+            .collect()
     }
 
     fn remove_operation(
@@ -310,15 +311,15 @@ mod tests {
 
         mempool.add_operation(&operation).unwrap();
 
-        let best_before: Vec<_> = mempool.get_top_operations(10).collect();
+        let best_before: Vec<_> = mempool.get_top_operations(10);
         assert_eq!(best_before.len(), 1);
         assert_eq!(best_before[0].hash, hash);
 
         let result = mempool.remove_operation(&hash);
         assert!(result.is_ok());
         assert!(result.unwrap().is_some());
 
-        let best_after: Vec<_> = mempool.get_top_operations(10).collect();
+        let best_after: Vec<_> = mempool.get_top_operations(10);
         assert_eq!(best_after.len(), 0);
     }
 
@@ -338,7 +339,7 @@ mod tests {
         let operation3 = create_wrapped_operation(1500, hash3);
         mempool.add_operation(&operation3).unwrap();
 
-        let best: Vec<_> = mempool.get_top_operations(10).collect();
+        let best: Vec<_> = mempool.get_top_operations(10);
         assert_eq!(best.len(), 3);
         assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000));
         assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000));
@@ -361,7 +362,7 @@ mod tests {
         let operation3 = create_wrapped_operation(1500, hash3);
         mempool.add_operation(&operation3).unwrap();
 
-        let best: Vec<_> = mempool.get_top_operations(2).collect();
+        let best: Vec<_> = mempool.get_top_operations(2);
         assert_eq!(best.len(), 2);
         assert_eq!(best[0].operation.max_fee_per_gas(), Uint::from(3000));
         assert_eq!(best[1].operation.max_fee_per_gas(), Uint::from(2000));
@@ -379,7 +380,7 @@ mod tests {
         let operation2 = create_wrapped_operation(2000, hash2);
         mempool.add_operation(&operation2).unwrap();
 
-        let best: Vec<_> = mempool.get_top_operations(2).collect();
+        let best: Vec<_> = mempool.get_top_operations(2);
         assert_eq!(best.len(), 2);
         assert_eq!(best[0].hash, hash1);
         assert_eq!(best[1].hash, hash2);
@@ -417,7 +418,7 @@ mod tests {
         };
         mempool.add_operation(&operation2).unwrap();
 
-        let best: Vec<_> = mempool.get_top_operations(2).collect();
+        let best: Vec<_> = mempool.get_top_operations(2);
         assert_eq!(best.len(), 1);
         assert_eq!(best[0].operation.nonce(), Uint::from(0));
     }

crates/account-abstraction-core/src/services/mempool_engine.rs

@@ -128,7 +128,7 @@ mod tests {
         let engine = MempoolEngine::new(mempool.clone(), mock_source);
 
         engine.process_next().await.unwrap();
-        let items: Vec<_> = mempool.read().await.get_top_operations(10).collect();
+        let items: Vec<_> = mempool.read().await.get_top_operations(10);
         assert_eq!(items.len(), 1);
         assert_eq!(items[0].hash, FixedBytes::from(op_hash));
     }
@@ -149,11 +149,11 @@ mod tests {
 
         let engine = MempoolEngine::new(mempool.clone(), mock_source);
         engine.process_next().await.unwrap();
-        let items: Vec<_> = mempool.read().await.get_top_operations(10).collect();
+        let items: Vec<_> = mempool.read().await.get_top_operations(10);
         assert_eq!(items.len(), 1);
         assert_eq!(items[0].hash, FixedBytes::from(op_hash));
         engine.process_next().await.unwrap();
-        let items: Vec<_> = mempool.read().await.get_top_operations(10).collect();
+        let items: Vec<_> = mempool.read().await.get_top_operations(10);
         assert_eq!(items.len(), 0);
     }
 }