fix: update mock network components use

Author: achingbrain

packages/interface-mocks/src/connection-manager.ts

@@ -8,21 +8,21 @@ import errCode from 'err-code'
 import type { Registrar } from '@libp2p/interface-registrar'
 import type { PubSub } from '@libp2p/interface-pubsub'
 
-export interface NetworkComponents {
+export interface MockNetworkComponents {
   peerId: PeerId
   registrar: Registrar
   connectionManager: ConnectionManager
   pubsub?: PubSub
 }
 
 class MockNetwork {
-  private components: NetworkComponents[] = []
+  private components: MockNetworkComponents[] = []
 
-  addNode (components: NetworkComponents): void {
+  addNode (components: MockNetworkComponents): void {
     this.components.push(components)
   }
 
-  getNode (peerId: PeerId): NetworkComponents {
+  getNode (peerId: PeerId): MockNetworkComponents {
     for (const components of this.components) {
       if (peerId.equals(components.peerId)) {
         return components
@@ -41,10 +41,10 @@ export const mockNetwork = new MockNetwork()
 
 class MockConnectionManager extends EventEmitter<ConnectionManagerEvents> implements ConnectionManager, Startable {
   private connections: Connection[] = []
-  private readonly components: NetworkComponents
+  private readonly components: MockNetworkComponents
   private started = false
 
-  constructor (components: NetworkComponents) {
+  constructor (components: MockNetworkComponents) {
     super()
 
     this.components = components
@@ -154,6 +154,6 @@ class MockConnectionManager extends EventEmitter<ConnectionManagerEvents> implem
   }
 }
 
-export function mockConnectionManager (components: NetworkComponents) {
+export function mockConnectionManager (components: MockNetworkComponents) {
   return new MockConnectionManager(components)
 }

packages/interface-mocks/src/index.ts

@@ -8,4 +8,4 @@ export { mockRegistrar } from './registrar.js'
 export { mockUpgrader } from './upgrader.js'
 export { mockDuplex } from './duplex.js'
 export type { MockUpgraderInit } from './upgrader.js'
-export type { NetworkComponents } from './connection-manager.js'
+export type { MockNetworkComponents } from './connection-manager.js'

packages/interface-pubsub-compliance-tests/src/connection-handlers.ts

@@ -11,14 +11,14 @@ import { start, stop } from '@libp2p/interfaces/startable'
 import { createComponents } from './utils.js'
 import { pEvent } from 'p-event'
 import { mockNetwork } from '@libp2p/interface-mocks'
-import type { NetworkComponents } from '@libp2p/interface-mocks'
+import type { MockNetworkComponents } from '@libp2p/interface-mocks'
 
 export default (common: TestSetup<PubSub, PubSubArgs>) => {
   describe('pubsub connection handlers', () => {
     let psA: PubSub
     let psB: PubSub
-    let componentsA: NetworkComponents
-    let componentsB: NetworkComponents
+    let componentsA: MockNetworkComponents
+    let componentsB: MockNetworkComponents
 
     describe('nodes send state on connection', () => {
       // Create pubsub nodes and connect them
@@ -85,8 +85,8 @@ export default (common: TestSetup<PubSub, PubSubArgs>) => {
     describe('pubsub started before connect', () => {
       let psA: PubSub
       let psB: PubSub
-      let componentsA: NetworkComponents
-      let componentsB: NetworkComponents
+      let componentsA: MockNetworkComponents
+      let componentsB: MockNetworkComponents
 
       // Create pubsub nodes and start them
       beforeEach(async () => {
@@ -159,8 +159,8 @@ export default (common: TestSetup<PubSub, PubSubArgs>) => {
     describe('pubsub started after connect', () => {
       let psA: PubSub
       let psB: PubSub
-      let componentsA: NetworkComponents
-      let componentsB: NetworkComponents
+      let componentsA: MockNetworkComponents
+      let componentsB: MockNetworkComponents
 
       // Create pubsub nodes
       beforeEach(async () => {
@@ -240,8 +240,8 @@ export default (common: TestSetup<PubSub, PubSubArgs>) => {
     describe('pubsub with intermittent connections', () => {
       let psA: PubSub
       let psB: PubSub
-      let componentsA: NetworkComponents
-      let componentsB: NetworkComponents
+      let componentsA: MockNetworkComponents
+      let componentsB: MockNetworkComponents
 
       // Create pubsub nodes and start them
       beforeEach(async () => {

packages/interface-pubsub-compliance-tests/src/utils.ts

@@ -4,7 +4,7 @@ import type { PubSub, SubscriptionChangeData } from '@libp2p/interface-pubsub'
 import type { PeerId } from '@libp2p/interface-peer-id'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { mockConnectionManager, mockRegistrar, mockNetwork } from '@libp2p/interface-mocks'
-import type { NetworkComponents } from '@libp2p/interface-mocks/src/connection-manager'
+import type { MockNetworkComponents } from '@libp2p/interface-mocks'
 
 export async function waitForSubscriptionUpdate (a: PubSub, b: PeerId) {
   await pWaitFor(async () => {
@@ -14,7 +14,7 @@ export async function waitForSubscriptionUpdate (a: PubSub, b: PeerId) {
   })
 }
 
-export async function createComponents (): Promise<NetworkComponents> {
+export async function createComponents (): Promise<MockNetworkComponents> {
   const components: any = {
     peerId: await createEd25519PeerId(),
     registrar: mockRegistrar()