chore: do not reset sinon

packages/libp2p/src/address-manager/index.ts → packages/libp2p/src/address-manager.ts

@@ -1,6 +1,6 @@
 import { peerIdFromString } from '@libp2p/peer-id'
+import { debounce } from '@libp2p/utils/debounce'
 import { multiaddr, protocols } from '@multiformats/multiaddr'
-import { debounce } from './utils.js'
 import type { ComponentLogger, Libp2pEvents, Logger, TypedEventTarget, PeerId, PeerStore } from '@libp2p/interface'
 import type { AddressManager as AddressManagerInterface, TransportManager } from '@libp2p/interface-internal'
 import type { Multiaddr } from '@multiformats/multiaddr'
@@ -84,6 +84,8 @@ export class AddressManager implements AddressManagerInterface {
   private readonly announceFilter: AddressFilter
   private readonly ipDomainMappings: Map<string, string>
 
+  private readonly where: Error
+
   /**
    * Responsible for managing the peer addresses.
    * Peers can specify their listen and announce addresses.
@@ -113,6 +115,8 @@ export class AddressManager implements AddressManagerInterface {
     components.events.addEventListener('transport:close', () => {
       this._updatePeerStoreAddresses()
     })
+
+    this.where = new Error('where')
   }
 
   readonly [Symbol.toStringTag] = '@libp2p/address-manager'

packages/libp2p/src/index.ts

@@ -18,7 +18,7 @@ import { generateKeyPair } from '@libp2p/crypto/keys'
 import { peerIdFromPrivateKey } from '@libp2p/peer-id'
 import { validateConfig } from './config.js'
 import { Libp2p as Libp2pClass } from './libp2p.js'
-import type { AddressManagerInit, AddressFilter } from './address-manager/index.js'
+import type { AddressManagerInit, AddressFilter } from './address-manager.js'
 import type { Components } from './components.js'
 import type { ConnectionManagerInit } from './connection-manager/index.js'
 import type { ConnectionMonitorInit } from './connection-monitor.js'

packages/libp2p/src/libp2p.ts

@@ -8,7 +8,7 @@ import { isMultiaddr, type Multiaddr } from '@multiformats/multiaddr'
 import { MemoryDatastore } from 'datastore-core/memory'
 import { concat as uint8ArrayConcat } from 'uint8arrays/concat'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { AddressManager } from './address-manager/index.js'
+import { AddressManager } from './address-manager.js'
 import { checkServiceDependencies, defaultComponents } from './components.js'
 import { connectionGater } from './config/connection-gater.js'
 import { DefaultConnectionManager } from './connection-manager/index.js'

packages/libp2p/test/addresses/address-manager.spec.ts

@@ -1,15 +1,15 @@
 /* eslint-env mocha */
 
 import { generateKeyPair } from '@libp2p/crypto/keys'
-import { TypedEventEmitter, type TypedEventTarget, type Libp2pEvents, type PeerId, type PeerStore } from '@libp2p/interface'
+import { TypedEventEmitter, type TypedEventTarget, type Libp2pEvents, type PeerId, type PeerStore, type Peer } from '@libp2p/interface'
 import { defaultLogger } from '@libp2p/logger'
 import { peerIdFromPrivateKey } from '@libp2p/peer-id'
 import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
 import delay from 'delay'
 import Sinon from 'sinon'
 import { type StubbedInstance, stubInterface } from 'sinon-ts'
-import { type AddressFilter, AddressManager } from '../../src/address-manager/index.js'
+import { type AddressFilter, AddressManager } from '../../src/address-manager.js'
 import type { TransportManager } from '@libp2p/interface-internal'
 
 const listenAddresses = ['/ip4/127.0.0.1/tcp/15006/ws', '/ip4/127.0.0.1/tcp/15008/ws']
@@ -23,7 +23,7 @@ describe('Address Manager', () => {
   beforeEach(async () => {
     peerId = peerIdFromPrivateKey(await generateKeyPair('Ed25519'))
     peerStore = stubInterface<PeerStore>({
-      patch: Sinon.stub().resolves({})
+      patch: Sinon.stub().resolves(stubInterface<Peer>())
     })
     events = new TypedEventEmitter()
   })

packages/libp2p/test/connection-manager/dial-queue.spec.ts

@@ -43,8 +43,6 @@ describe('dial queue', () => {
     if (dialer != null) {
       dialer.stop()
     }
-
-    sinon.reset()
   })
 
   it('should end when a single multiaddr dials succeeds', async () => {

packages/libp2p/test/connection-manager/reconnect-queue.spec.ts

@@ -7,7 +7,7 @@ import { peerIdFromPrivateKey } from '@libp2p/peer-id'
 import { expect } from 'aegir/chai'
 import delay from 'delay'
 import pRetry from 'p-retry'
-import sinon from 'sinon'
+import Sinon from 'sinon'
 import { type StubbedInstance, stubInterface } from 'sinon-ts'
 import { ReconnectQueue } from '../../src/connection-manager/reconnect-queue.js'
 import type { ComponentLogger, Libp2pEvents, PeerStore, TypedEventTarget, Peer } from '@libp2p/interface'
@@ -28,15 +28,15 @@ describe('reconnect queue', () => {
     components = {
       connectionManager: stubInterface(),
       events: new TypedEventEmitter<Libp2pEvents>(),
-      peerStore: stubInterface<PeerStore>(),
+      peerStore: stubInterface<PeerStore>({
+        all: Sinon.stub().resolves([])
+      }),
       logger: peerLogger(peerId)
     }
   })
 
   afterEach(async () => {
     await stop(queue)
-
-    sinon.reset()
   })
 
   it('should reconnect to KEEP_ALIVE peers on startup', async () => {

packages/libp2p/test/peer-discovery/peer-discovery.spec.ts

@@ -15,8 +15,6 @@ describe('peer discovery', () => {
     if (libp2p != null) {
       await libp2p.stop()
     }
-
-    sinon.reset()
   })
 
   it('should start/stop startable discovery on libp2p start/stop', async () => {

packages/libp2p/test/transports/transport-manager.spec.ts

@@ -12,7 +12,7 @@ import { pEvent } from 'p-event'
 import pWaitFor from 'p-wait-for'
 import Sinon from 'sinon'
 import { stubInterface } from 'sinon-ts'
-import { AddressManager } from '../../src/address-manager/index.js'
+import { AddressManager } from '../../src/address-manager.js'
 import { DefaultTransportManager } from '../../src/transport-manager.js'
 import type { Components } from '../../src/components.js'
 import type { Connection, Transport, Upgrader, Listener } from '@libp2p/interface'