diff --git a/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts b/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts index ed2c38adb9a2..cc01c9f93162 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/p2p_network.ts @@ -39,10 +39,8 @@ const l1ContractsConfig = getL1ContractsConfigEnvVars(); export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3; export const SHORTENED_BLOCK_TIME_CONFIG = { - aztecEpochDuration: 4, aztecSlotDuration: 12, ethereumSlotDuration: 4, - aztecProofSubmissionWindow: 4 * 2 - 1, // epoch_duration * 2 - 1 }; export class P2PNetworkTest { diff --git a/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts b/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts index c661983224ec..b1d6737bd090 100644 --- a/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts +++ b/yarn-project/end-to-end/src/e2e_p2p/reqresp.test.ts @@ -89,11 +89,11 @@ describe('e2e_p2p_reqresp_tx', () => { t.logger.info(`Sending txs to proposer nodes: ${proposerIndexes}`); // Replace the p2p node implementation of some of the nodes with a spy such that it does not store transactions that are gossiped to it - // Original implementation of `processTxFromPeer` will store received transactions in the tx pool. + // Original implementation of `handleGossipedTx` will store received transactions in the tx pool. // We chose the first 2 nodes that will be the proposers for the next few slots for (const nodeIndex of nodesToTurnOffTxGossip) { jest - .spyOn((nodes[nodeIndex] as any).p2pClient.p2pService, 'processTxFromPeer') + .spyOn((nodes[nodeIndex] as any).p2pClient.p2pService, 'handleGossipedTx') .mockImplementation((): Promise => { return Promise.resolve(); }); diff --git a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts index 8992681a4107..c63a989d80a5 100644 --- a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts +++ b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts @@ -622,9 +622,13 @@ export class LibP2PService extends WithTracer implement public async propagate(message: T) { const p2pMessageIdentifier = await message.p2pMessageIdentifier(); this.logger.trace(`Message ${p2pMessageIdentifier} queued`, { p2pMessageIdentifier }); - void this.jobQueue.put(async () => { - await this.sendToPeers(message); - }); + void this.jobQueue + .put(async () => { + await this.sendToPeers(message); + }) + .catch(error => { + this.logger.error(`Error propagating message ${p2pMessageIdentifier}`, { error }); + }); } /** diff --git a/yarn-project/p2p/src/services/reqresp/reqresp.ts b/yarn-project/p2p/src/services/reqresp/reqresp.ts index 1edaf47ef43c..fabb9172b31b 100644 --- a/yarn-project/p2p/src/services/reqresp/reqresp.ts +++ b/yarn-project/p2p/src/services/reqresp/reqresp.ts @@ -607,8 +607,6 @@ export class ReqResp { const handler = this.subProtocolHandlers[protocol]; const transform = this.snappyTransform; - this.logger.info(`Stream handler for ${protocol}`); - await pipe( stream, async function* (source: any) {