refactor(p2p): remove AttestationPool interface, rename KvAttestationPool to AttestationPool

- Merge KvAttestationPool class into attestation_pool.ts and rename to AttestationPool
- Move TryAddResult type definition to the class file
- Delete kv_attestation_pool.ts and kv_attestation_pool.test.ts files
- Add AttestationPoolApi type alias for typing mocks and test implementations
- Update all imports across the codebase to use the renamed class
- Update MemPools and P2PClientDeps types to use AttestationPoolApi for flexibility
- Rename test file from kv_attestation_pool.test.ts to attestation_pool.test.ts

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: spalladino

yarn-project/p2p/src/client/factory.ts

@@ -13,8 +13,7 @@ import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-clien
 
 import { P2PClient } from '../client/p2p_client.js';
 import type { P2PConfig } from '../config.js';
-import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
-import { KvAttestationPool } from '../mem_pools/attestation_pool/kv_attestation_pool.js';
+import { AttestationPool, type AttestationPoolApi } from '../mem_pools/attestation_pool/attestation_pool.js';
 import type { MemPools } from '../mem_pools/interface.js';
 import { AztecKVTxPool, type TxPool } from '../mem_pools/tx_pool/index.js';
 import { DummyP2PService } from '../services/dummy_service.js';
@@ -26,7 +25,7 @@ import { configureP2PClientAddresses, createLibP2PPeerIdFromPrivateKey, getPeerI
 export type P2PClientDeps<T extends P2PClientType> = {
   txPool?: TxPool;
   store?: AztecAsyncKVStore;
-  attestationPool?: AttestationPool;
+  attestationPool?: AttestationPoolApi;
   logger?: Logger;
   txCollectionNodeSources?: TxSource[];
   p2pServiceFactory?: (...args: Parameters<(typeof LibP2PService)['new']>) => Promise<LibP2PService<T>>;
@@ -76,7 +75,7 @@ export async function createP2PClient<T extends P2PClientType>(
         maxPendingTxCount: config.maxPendingTxCount,
         archivedTxLimit: config.archivedTxLimit,
       }),
-    attestationPool: deps.attestationPool ?? new KvAttestationPool(attestationStore, telemetry),
+    attestationPool: deps.attestationPool ?? new AttestationPool(attestationStore, telemetry),
   };
 
   const p2pService = await createP2PService<T>(

yarn-project/p2p/src/client/p2p_client.test.ts

@@ -25,8 +25,7 @@ import { type MockProxy, mock } from 'jest-mock-extended';
 
 import type { P2PConfig } from '../config.js';
 import type { P2PService } from '../index.js';
-import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
-import { createTestAttestationPool } from '../mem_pools/attestation_pool/kv_attestation_pool.js';
+import { type AttestationPool, createTestAttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
 import type { MemPools } from '../mem_pools/interface.js';
 import { AztecKVTxPool } from '../mem_pools/tx_pool/aztec_kv_tx_pool.js';
 import type { TxPool } from '../mem_pools/tx_pool/index.js';

yarn-project/p2p/src/client/p2p_client.ts

@@ -29,7 +29,7 @@ import type { PeerId } from '@libp2p/interface';
 import type { ENR } from '@nethermindeth/enr';
 
 import { type P2PConfig, getP2PDefaultConfig } from '../config.js';
-import type { AttestationPool } from '../mem_pools/attestation_pool/attestation_pool.js';
+import type { AttestationPoolApi } from '../mem_pools/attestation_pool/attestation_pool.js';
 import type { MemPools } from '../mem_pools/interface.js';
 import type { TxPool } from '../mem_pools/tx_pool/index.js';
 import type { AuthRequest, StatusMessage } from '../services/index.js';
@@ -70,7 +70,7 @@ export class P2PClient<T extends P2PClientType = P2PClientType.Full>
   private synchedLatestSlot: AztecAsyncSingleton<bigint>;
 
   private txPool: TxPool;
-  private attestationPool: AttestationPool;
+  private attestationPool: AttestationPoolApi;
 
   private config: P2PConfig;
 

…station_pool/kv_attestation_pool.test.ts …ttestation_pool/attestation_pool.test.tsyarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.test.ts renamed to yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.test.ts yarn-project/p2p/src/mem_pools/attestation_pool/kv_attestation_pool.test.ts renamed to yarn-project/p2p/src/mem_pools/attestation_pool/attestation_pool.test.ts

@@ -5,34 +5,34 @@ import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb-v2';
 import { makeBlockHeader, makeBlockProposal } from '@aztec/stdlib/testing';
 
+import { ATTESTATION_CAP_BUFFER, AttestationPool } from './attestation_pool.js';
 import { describeAttestationPool } from './attestation_pool_test_suite.js';
-import { ATTESTATION_CAP_BUFFER, KvAttestationPool } from './kv_attestation_pool.js';
 import { mockCheckpointAttestation } from './mocks.js';
 
-describe('KV Attestation Pool', () => {
-  let kvAttestationPool: KvAttestationPool;
+describe('Attestation Pool', () => {
+  let attestationPool: AttestationPool;
   let store: AztecAsyncKVStore;
 
   beforeEach(async () => {
     store = await openTmpStore('test');
-    kvAttestationPool = new KvAttestationPool(store);
+    attestationPool = new AttestationPool(store);
   });
 
   afterEach(() => store.close());
 
-  describeAttestationPool(() => kvAttestationPool);
+  describeAttestationPool(() => attestationPool);
 
   describe('BlockProposal behavior', () => {
     it('should allow adding block proposals up to position cap', async () => {
       const slotNumber = 100;
       const header = makeBlockHeader(1, { slotNumber: SlotNumber(slotNumber) });
 
-      // Add 1 proposal and re-add it (duplicate) → should return alreadyExists
+      // Add 1 proposal and re-add it (duplicate) -> should return alreadyExists
       const p0 = await makeBlockProposal({ blockHeader: header, archiveRoot: Fr.random() });
-      const result0 = await kvAttestationPool.tryAddBlockProposal(p0);
+      const result0 = await attestationPool.tryAddBlockProposal(p0);
       expect(result0.added).toBe(true);
 
-      const result0Dup = await kvAttestationPool.tryAddBlockProposal(p0);
+      const result0Dup = await attestationPool.tryAddBlockProposal(p0);
       expect(result0Dup.added).toBe(false);
       expect(result0Dup.alreadyExists).toBe(true);
     });
@@ -54,20 +54,20 @@ describe('KV Attestation Pool', () => {
 
       // Add each attestation using tryAddCheckpointAttestation
       for (let i = 0; i < attestations.length; i++) {
-        const result = await kvAttestationPool.tryAddCheckpointAttestation(attestations[i], committeeSize);
+        const result = await attestationPool.tryAddCheckpointAttestation(attestations[i], committeeSize);
         expect(result.added).toBe(true);
         expect(result.totalForPosition).toBe(i + 1);
       }
 
       // A new attestation from a new signer should not be added (cap reached)
       const extra = mockCheckpointAttestation(Secp256k1Signer.random(), slotNumber, archive);
-      const extraResult = await kvAttestationPool.tryAddCheckpointAttestation(extra, committeeSize);
+      const extraResult = await attestationPool.tryAddCheckpointAttestation(extra, committeeSize);
       expect(extraResult.added).toBe(false);
       expect(extraResult.alreadyExists).toBe(false);
       expect(extraResult.totalForPosition).toBe(limit);
 
       // Re-adding an existing attestation should return alreadyExists
-      const existingResult = await kvAttestationPool.tryAddCheckpointAttestation(attestations[0], committeeSize);
+      const existingResult = await attestationPool.tryAddCheckpointAttestation(attestations[0], committeeSize);
       expect(existingResult.added).toBe(false);
       expect(existingResult.alreadyExists).toBe(true);
     });