diff --git a/yarn-project/p2p/src/services/discv5/discv5_service.test.ts b/yarn-project/p2p/src/services/discv5/discv5_service.test.ts index 01d5bf5ebf1d..552aa98e6dfa 100644 --- a/yarn-project/p2p/src/services/discv5/discv5_service.test.ts +++ b/yarn-project/p2p/src/services/discv5/discv5_service.test.ts @@ -9,8 +9,8 @@ import { createSecp256k1PeerId } from '@libp2p/peer-id-factory'; import { BootstrapNode } from '../../bootstrap/bootstrap.js'; import { type BootnodeConfig, type P2PConfig, getP2PDefaultConfig } from '../../config.js'; -import { DiscV5Service } from './discV5_service.js'; import { PeerDiscoveryState } from '../service.js'; +import { DiscV5Service } from './discV5_service.js'; const waitForPeers = (node: DiscV5Service, expectedCount: number): Promise => { const timeout = 7_000; diff --git a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts index beb3f1ef49d3..e4a6449a539f 100644 --- a/yarn-project/p2p/src/services/libp2p/libp2p_service.ts +++ b/yarn-project/p2p/src/services/libp2p/libp2p_service.ts @@ -46,8 +46,8 @@ import { import { type PubSubLibp2p, convertToMultiaddr } from '../../util.js'; import { AztecDatastore } from '../data_store.js'; import { SnappyTransform, fastMsgIdFn, getMsgIdFn, msgIdToStrFn } from '../encoding.js'; -import { PeerManager } from '../peer_manager.js'; import { PeerErrorSeverity } from '../peer-scoring/peer_scoring.js'; +import { PeerManager } from '../peer_manager.js'; import { pingHandler, statusHandler } from '../reqresp/handlers.js'; import { DEFAULT_SUB_PROTOCOL_HANDLERS, @@ -504,8 +504,6 @@ export class LibP2PService extends WithTracer implement [Attributes.TX_HASH]: requestedTxHash.toString(), })) private async validateRequestedTx(requestedTxHash: TxHash, responseTx: Tx, peerId: PeerId): Promise { - - const proofValidator = new TxProofValidator(this.proofVerifier); const validProof = await proofValidator.validateTx(responseTx); diff --git a/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.test.ts b/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.test.ts index 32c420724978..019d0a7183b1 100644 --- a/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.test.ts +++ b/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.test.ts @@ -2,8 +2,8 @@ import { jest } from '@jest/globals'; import { type PeerId } from '@libp2p/interface'; import { type MockProxy, mock } from 'jest-mock-extended'; -import { type PeerManager } from '../../peer_manager.js'; import { PeerErrorSeverity } from '../../peer-scoring/peer_scoring.js'; +import { type PeerManager } from '../../peer_manager.js'; import { PING_PROTOCOL, type ReqRespSubProtocolRateLimits, TX_REQ_PROTOCOL } from '../interface.js'; import { RequestResponseRateLimiter } from './rate_limiter.js'; diff --git a/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.ts b/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.ts index 5bba6c5a5eba..be92f06ec2f6 100644 --- a/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.ts +++ b/yarn-project/p2p/src/services/reqresp/rate_limiter/rate_limiter.ts @@ -5,8 +5,8 @@ */ import { type PeerId } from '@libp2p/interface'; -import { type PeerManager } from '../../peer_manager.js'; import { PeerErrorSeverity } from '../../peer-scoring/peer_scoring.js'; +import { type PeerManager } from '../../peer_manager.js'; import { type ReqRespSubProtocol, type ReqRespSubProtocolRateLimits } from '../interface.js'; import { DEFAULT_RATE_LIMITS } from './rate_limits.js'; diff --git a/yarn-project/p2p/src/services/reqresp/reqresp.test.ts b/yarn-project/p2p/src/services/reqresp/reqresp.test.ts index 84acf11c089d..5552b0c2afa7 100644 --- a/yarn-project/p2p/src/services/reqresp/reqresp.test.ts +++ b/yarn-project/p2p/src/services/reqresp/reqresp.test.ts @@ -14,8 +14,8 @@ import { startNodes, stopNodes, } from '../../mocks/index.js'; -import { type PeerManager } from '../peer_manager.js'; import { PeerErrorSeverity } from '../peer-scoring/peer_scoring.js'; +import { type PeerManager } from '../peer_manager.js'; import { PING_PROTOCOL, RequestableBuffer, TX_REQ_PROTOCOL } from './interface.js'; const PING_REQUEST = RequestableBuffer.fromBuffer(Buffer.from('ping')); diff --git a/yarn-project/p2p/src/services/reqresp/reqresp.ts b/yarn-project/p2p/src/services/reqresp/reqresp.ts index be501703a436..4d482f8745f3 100644 --- a/yarn-project/p2p/src/services/reqresp/reqresp.ts +++ b/yarn-project/p2p/src/services/reqresp/reqresp.ts @@ -9,8 +9,8 @@ import { compressSync, uncompressSync } from 'snappy'; import { type Uint8ArrayList } from 'uint8arraylist'; import { CollectiveReqRespTimeoutError, IndiviualReqRespTimeoutError } from '../../errors/reqresp.error.js'; -import { type PeerManager } from '../peer_manager.js'; import { PeerErrorSeverity } from '../peer-scoring/peer_scoring.js'; +import { type PeerManager } from '../peer_manager.js'; import { type P2PReqRespConfig } from './config.js'; import { DEFAULT_SUB_PROTOCOL_HANDLERS,