Reverted unnecessary change

Author: PhilWindle

yarn-project/p2p/src/mem_pools/tx_pool/README.md

@@ -241,7 +241,7 @@ Evicts low-priority transactions when a fee payer's pending fee limits exceed th
 Enforces maximum pool size by evicting lowest-priority (by fee) transactions:
 
 - Configured via `maxPendingTxCount` option (0 = disabled)
-- Uses `getLowestPriorityPending()` to find txs to evict
+- Uses `getLowestPriorityEvictable()` to find txs to evict
 
 ### Non-Evictable Transactions
 

yarn-project/p2p/src/mem_pools/tx_pool/aztec_kv_tx_pool.test.ts

@@ -391,7 +391,7 @@ describe('KV TX pool', () => {
     await expect(txPool.getPendingTxHashes()).resolves.toEqual([tx5.getTxHash(), tx4.getTxHash(), tx1.getTxHash()]);
   });
 
-  describe('getLowestPriorityPending', () => {
+  describe('getLowestPriorityEvictable', () => {
     it('returns the lowest-priority evictable tx hashes up to limit', async () => {
       txPool = new AztecKVTxPool(await openTmpStore('p2p'), await openTmpStore('archive'), worldState, undefined, {
         maxPendingTxCount: 0,
@@ -406,14 +406,14 @@ describe('KV TX pool', () => {
       // Mark tx2 as non-evictable; tx1 should be considered first
       await txPool.markTxsAsNonEvictable([tx2.getTxHash()]);
 
-      const res1 = await txPool.getLowestPriorityPending(1);
+      const res1 = await txPool.getLowestPriorityEvictable(1);
       expect(res1).toEqual([tx1.getTxHash()]);
 
-      const res2 = await txPool.getLowestPriorityPending(2);
+      const res2 = await txPool.getLowestPriorityEvictable(2);
       // After skipping non-evictable tx2, next lowest is tx3
       expect(res2).toEqual([tx1.getTxHash(), tx3.getTxHash()]);
 
-      const res3 = await txPool.getLowestPriorityPending(10);
+      const res3 = await txPool.getLowestPriorityEvictable(10);
       expect(res3).toEqual([tx1.getTxHash(), tx3.getTxHash(), tx4.getTxHash()]);
     });
 
@@ -422,10 +422,10 @@ describe('KV TX pool', () => {
       const tx1 = await mockTx(10, { maxPriorityFeesPerGas: new GasFees(1, 1) });
       await txPool.addTxs([tx1]);
 
-      expect(await txPool.getLowestPriorityPending(0)).toEqual([]);
+      expect(await txPool.getLowestPriorityEvictable(0)).toEqual([]);
 
       await txPool.markTxsAsNonEvictable([tx1.getTxHash()]);
-      expect(await txPool.getLowestPriorityPending(1)).toEqual([]);
+      expect(await txPool.getLowestPriorityEvictable(1)).toEqual([]);
     });
   });
 

yarn-project/p2p/src/mem_pools/tx_pool/aztec_kv_tx_pool.ts

@@ -706,10 +706,10 @@ export class AztecKVTxPool
   }
 
   /**
-   * Returns up to `limit` lowest-priority pending tx hashes without hydrating transactions.
+   * Returns up to `limit` lowest-priority evictable pending tx hashes without hydrating transactions.
    * Iterates the priority index in ascending order and skips non-evictable txs.
    */
-  public async getLowestPriorityPending(limit: number): Promise<TxHash[]> {
+  public async getLowestPriorityEvictable(limit: number): Promise<TxHash[]> {
     const txsToEvict: TxHash[] = [];
     if (limit <= 0) {
       return txsToEvict;

yarn-project/p2p/src/mem_pools/tx_pool/eviction/eviction_strategy.ts

@@ -74,10 +74,10 @@ export interface TxPoolOperations {
   /** Cheap count of current pending transactions. */
   getPendingTxCount(): Promise<number>;
   /**
-   * Returns up to `limit` lowest-priority pending tx hashes.
+   * Returns up to `limit` lowest-priority evictable pending tx hashes.
    * Ordering should be from lowest priority upwards.
    */
-  getLowestPriorityPending(limit: number): Promise<TxHash[]>;
+  getLowestPriorityEvictable(limit: number): Promise<TxHash[]>;
   deleteTxs(txHashes: TxHash[], opts?: { permanently?: boolean }): Promise<void>;
 }
 

yarn-project/p2p/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.test.ts

@@ -15,7 +15,7 @@ describe('LowPriorityEvictionRule', () => {
     txPool = mock();
     txPool.getPendingTxInfos.mockResolvedValue([]);
     txPool.getPendingTxCount.mockResolvedValue(0);
-    txPool.getLowestPriorityPending.mockResolvedValue([]);
+    txPool.getLowestPriorityEvictable.mockResolvedValue([]);
 
     config = {
       maxPoolSize: 100,
@@ -126,7 +126,7 @@ describe('LowPriorityEvictionRule', () => {
         const tx2 = TxHash.random();
 
         txPool.getPendingTxCount.mockResolvedValue(3);
-        txPool.getLowestPriorityPending.mockResolvedValue([tx1, tx2]);
+        txPool.getLowestPriorityEvictable.mockResolvedValue([tx1, tx2]);
 
         const result = await rule.evict(context, txPool);
 
@@ -145,7 +145,7 @@ describe('LowPriorityEvictionRule', () => {
         (context as any).newTxs = [newTx1, newTx2];
 
         txPool.getPendingTxCount.mockResolvedValue(3);
-        txPool.getLowestPriorityPending.mockResolvedValue([oldTx, newTx1]);
+        txPool.getLowestPriorityEvictable.mockResolvedValue([oldTx, newTx1]);
 
         const result = await rule.evict(context, txPool);
 
@@ -156,7 +156,7 @@ describe('LowPriorityEvictionRule', () => {
 
       it('handles all transactions being non-evictable', async () => {
         txPool.getPendingTxCount.mockResolvedValue(config.maxPoolSize + 1);
-        txPool.getLowestPriorityPending.mockResolvedValue([]);
+        txPool.getLowestPriorityEvictable.mockResolvedValue([]);
 
         const result = await rule.evict(context, txPool);
 
@@ -166,7 +166,7 @@ describe('LowPriorityEvictionRule', () => {
           txsEvicted: [],
         });
         expect(txPool.deleteTxs).not.toHaveBeenCalled();
-        expect(txPool.getLowestPriorityPending).toHaveBeenCalledWith(1);
+        expect(txPool.getLowestPriorityEvictable).toHaveBeenCalledWith(1);
       });
 
       it('handles error from txPool operations', async () => {
@@ -187,7 +187,7 @@ describe('LowPriorityEvictionRule', () => {
         const t1 = TxHash.random();
         const t2 = TxHash.random();
         txPool.getPendingTxCount.mockResolvedValue(2);
-        txPool.getLowestPriorityPending.mockResolvedValue([t1, t2]);
+        txPool.getLowestPriorityEvictable.mockResolvedValue([t1, t2]);
         txPool.deleteTxs.mockRejectedValue(new Error('Test error'));
 
         const result = await rule.evict(context, txPool);

yarn-project/p2p/src/mem_pools/tx_pool/eviction/low_priority_eviction_rule.ts

@@ -58,7 +58,7 @@ export class LowPriorityEvictionRule implements EvictionRule {
 
       this.log.verbose(`Evicting low priority txs. Pending tx count above limit: ${currentTxCount} > ${maxCount}`);
       const numberToEvict = currentTxCount - maxCount;
-      const txsToEvict: TxHash[] = await txPool.getLowestPriorityPending(numberToEvict);
+      const txsToEvict: TxHash[] = await txPool.getLowestPriorityEvictable(numberToEvict);
 
       if (txsToEvict.length > 0) {
         await txPool.deleteTxs(txsToEvict);