fix: resolve merge conflicts from v4 into v4-next

Author: AztecBot

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

@@ -18,14 +18,10 @@ import type { MemPools } from '../mem_pools/interface.js';
 import type { TxPoolV2 } from '../mem_pools/tx_pool_v2/interfaces.js';
 import { AztecKVTxPoolV2 } from '../mem_pools/tx_pool_v2/tx_pool_v2.js';
 import {
-<<<<<<< HEAD
   createCheckAllowedSetupCalls,
-  createTxValidatorForTransactionsEnteringPendingTxPool,
-  getDefaultAllowedSetupFunctions,
-=======
   createTxValidatorForReqResponseReceivedTxs,
   createTxValidatorForTransactionsEnteringPendingTxPool,
->>>>>>> origin/v4
+  getDefaultAllowedSetupFunctions,
 } from '../msg_validators/index.js';
 import { DummyP2PService } from '../services/dummy_service.js';
 import { LibP2PService } from '../services/index.js';

yarn-project/validator-client/src/validator.test.ts

@@ -93,11 +93,7 @@ describe('ValidatorClient', () => {
   let checkpointsBuilder: MockProxy<FullNodeCheckpointsBuilder>;
   let worldState: MockProxy<WorldStateSynchronizer>;
   let validatorAccounts: PrivateKeyAccount[];
-<<<<<<< HEAD
-  let validatorPrivateKeys: `0x${string}`[];
-=======
   let validatorPrivateKeys: ReturnType<typeof generatePrivateKey>[];
->>>>>>> origin/v4
   let dateProvider: TestDateProvider;
   let txProvider: MockProxy<TxProvider>;
   let keyStoreManager: KeystoreManager;
@@ -403,11 +399,7 @@ describe('ValidatorClient', () => {
 
       epochCache.getProposerAttesterAddressInSlot.mockResolvedValue(selfSigner.address);
 
-<<<<<<< HEAD
-      const handleSpy = jest.spyOn(validatorClient.getBlockProposalHandler(), 'handleBlockProposal');
-=======
       const handleSpy = jest.spyOn(validatorClient.getProposalHandler(), 'handleBlockProposal');
->>>>>>> origin/v4
       const isValid = await validatorClient.validateBlockProposal(selfProposal, sender);
       expect(isValid).toBe(true);
       expect(handleSpy).toHaveBeenCalled();