refactor(p2p): remove unused sendBatchRequest (#23273)

`sendBatchRequest` became unused after removing the slow tx flow and the
old tx reqresp method.

This PR removes sendBatchRequest and cleans up code that becomes unused.

It does NOT remove subprotocol validator registration/etc from reqresp.
This might be done in a follow-up depending on how
https://linear.app/aztec-labs/issue/A-1014/block-txs-reqresp-validator-validaterequestedblocktxs-is-never-invoked
becomes solved.

Author: fcarreiro

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

@@ -41,7 +41,6 @@ describe('P2P Client', () => {
     txPool.addPendingTxs.mockResolvedValue({ accepted: [], ignored: [], rejected: [] });
 
     p2pService = mock<P2PService>();
-    p2pService.sendBatchRequest.mockResolvedValue([]);
 
     l1Constants = EmptyL1RollupConstants;
     txCollection = mock<TxCollection>();

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

@@ -113,44 +113,6 @@ describe('p2p client integration reqresp', () => {
     return (p2pService as any).node.peerId;
   };
 
-  it('can request txs from peers via mock reqresp', async () => {
-    const numberOfNodes = 2;
-    const mockGossipSubNetwork = new MockGossipSubNetwork();
-
-    const testConfig = {
-      p2pBaseConfig: { ...p2pBaseConfig, rollupVersion: 1 },
-      mockAttestationPool: attestationPool,
-      mockTxPool: txPool,
-      mockEpochCache: epochCache,
-      mockWorldState: worldState,
-      alwaysTrueVerifier: true,
-      mockGossipSubNetwork,
-      logger,
-    };
-
-    const clientsAndConfig = await makeAndStartTestP2PClients(numberOfNodes, testConfig);
-    clients = clientsAndConfig.map(c => c.client);
-
-    await sleep(1000);
-
-    // Create a mock tx and configure the shared pool to return it
-    const tx = await createMockTxWithMetadata(testConfig.p2pBaseConfig);
-    const txHash = tx.getTxHash();
-
-    txPool.getTxByHash.mockImplementation((hash: TxHash) => Promise.resolve(hash.equals(txHash) ? tx : undefined));
-
-    // Request the tx from node-2, which will route to node-1 via the mock network
-    const reqresp = getReqResp(clients[1]);
-    const responses = await reqresp.sendBatchRequest(ReqRespSubProtocol.TX, [new TxHashArray(txHash)], undefined);
-
-    expect(responses).toHaveLength(1);
-    const txArray = responses[0] as TxArray;
-    expect(txArray).toHaveLength(1);
-
-    const receivedTxHash = txArray[0].getTxHash();
-    expect(receivedTxHash.toString()).toEqual(txHash.toString());
-  });
-
   it('sendRequestToPeer routes to the correct peer handler', async () => {
     const numberOfNodes = 2;
     const mockGossipSubNetwork = new MockGossipSubNetwork();
@@ -197,36 +159,4 @@ describe('p2p client integration reqresp', () => {
       expect(receivedTxHash.toString()).toEqual(txHash.toString());
     }
   });
-
-  it('reqresp returns empty when peer has no matching txs', async () => {
-    const numberOfNodes = 2;
-    const mockGossipSubNetwork = new MockGossipSubNetwork();
-
-    const testConfig = {
-      p2pBaseConfig: { ...p2pBaseConfig, rollupVersion: 1 },
-      mockAttestationPool: attestationPool,
-      mockTxPool: txPool,
-      mockEpochCache: epochCache,
-      mockWorldState: worldState,
-      alwaysTrueVerifier: true,
-      mockGossipSubNetwork,
-      logger,
-    };
-
-    const clientsAndConfig = await makeAndStartTestP2PClients(numberOfNodes, testConfig);
-    clients = clientsAndConfig.map(c => c.client);
-
-    await sleep(1000);
-
-    // Request a random tx hash that no peer has
-    const randomTxHash = TxHash.random();
-    const reqresp = getReqResp(clients[1]);
-    const responses = await reqresp.sendBatchRequest(ReqRespSubProtocol.TX, [new TxHashArray(randomTxHash)], undefined);
-
-    // The handler returns an empty TxArray (serialized as a 4-byte vector with count 0),
-    // so sendBatchRequest includes it as a response with an empty TxArray.
-    expect(responses).toHaveLength(1);
-    const txArray = responses[0] as TxArray;
-    expect(txArray).toHaveLength(0);
-  });
 });

yarn-project/p2p/src/errors/reqresp.error.ts

@@ -8,28 +8,3 @@ export class IndividualReqRespTimeoutError extends Error {
     super(`Request to peer timed out`);
   }
 }
-
-/** Collective request timeout error
- *
- * This error will be thrown when a req resp request times out regardless of the peer.
- * @category Errors
- */
-export class CollectiveReqRespTimeoutError extends Error {
-  constructor() {
-    super(`Request to all peers timed out`);
-  }
-}
-
-/** Invalid response error
- *
- * This error will be thrown when a response is received that is not valid.
- *
- * This error does not need to be punished as message validators will handle punishing invalid
- * requests
- * @category Errors
- */
-export class InvalidResponseError extends Error {
-  constructor() {
-    super(`Invalid response received`);
-  }
-}

yarn-project/p2p/src/services/dummy_service.ts

@@ -119,19 +119,6 @@ export class DummyP2PService implements P2PService {
     return Promise.resolve(undefined);
   }
 
-  /**
-   * Sends a batch request to a peer.
-   * @param _protocol - The protocol to send the request on.
-   * @param _requests - The requests to send.
-   * @returns The responses from the peer, otherwise undefined.
-   */
-  public sendBatchRequest<Protocol extends ReqRespSubProtocol>(
-    _protocol: Protocol,
-    _requests: InstanceType<SubProtocolMap[Protocol]['request']>[],
-  ): Promise<InstanceType<SubProtocolMap[Protocol]['response']>[]> {
-    return Promise.resolve([]);
-  }
-
   public sendRequestToPeer(
     _peerId: PeerId,
     _subProtocol: ReqRespSubProtocol,
@@ -306,16 +293,6 @@ export class DummyReqResp implements ReqRespInterface {
   ): Promise<InstanceType<SubProtocolMap[SubProtocol]['response']> | undefined> {
     return Promise.resolve(undefined);
   }
-  sendBatchRequest<SubProtocol extends ReqRespSubProtocol>(
-    _subProtocol: SubProtocol,
-    _requests: InstanceType<SubProtocolMap[SubProtocol]['request']>[],
-    _pinnedPeer: PeerId | undefined,
-    _timeoutMs?: number,
-    _maxPeers?: number,
-    _maxRetryAttempts?: number,
-  ): Promise<InstanceType<SubProtocolMap[SubProtocol]['response']>[]> {
-    return Promise.resolve([]);
-  }
   public sendRequestToPeer(
     _peerId: PeerId,
     _subProtocol: ReqRespSubProtocol,

yarn-project/p2p/src/services/libp2p/libp2p_service.ts

@@ -101,7 +101,6 @@ import {
   type ReqRespSubProtocolHandlers,
   type ReqRespSubProtocolValidators,
   StatusMessage,
-  type SubProtocolMap,
   ValidationError,
   pingHandler,
   reqGoodbyeHandler,
@@ -702,20 +701,6 @@ export class LibP2PService extends WithTracer implements P2PService {
     setImmediate(() => void safeJob());
   }
 
-  /**
-   * Send a batch of requests to peers, and return the responses
-   * @param protocol - The request response protocol to use
-   * @param requests - The requests to send to the peers
-   * @returns The responses to the requests
-   */
-  sendBatchRequest<SubProtocol extends ReqRespSubProtocol>(
-    protocol: SubProtocol,
-    requests: InstanceType<SubProtocolMap[SubProtocol]['request']>[],
-    pinnedPeerId: PeerId | undefined,
-  ): Promise<InstanceType<SubProtocolMap[SubProtocol]['response']>[]> {
-    return this.reqresp.sendBatchRequest(protocol, requests, pinnedPeerId);
-  }
-
   public sendRequestToPeer(
     peerId: PeerId,
     subProtocol: ReqRespSubProtocol,