deps(dev): update sinon-ts to 2.x.x (#2186)

Updates sinon-ts to 2.x

Author: achingbrain

packages/interface/package.json

@@ -177,6 +177,6 @@
     "it-all": "^3.0.3",
     "it-drain": "^3.0.3",
     "sinon": "^17.0.0",
-    "sinon-ts": "^1.0.0"
+    "sinon-ts": "^2.0.0"
   }
 }

packages/libp2p/package.json

@@ -193,7 +193,7 @@
     "p-wait-for": "^5.0.2",
     "protons": "^7.0.2",
     "sinon": "^17.0.0",
-    "sinon-ts": "^1.0.0"
+    "sinon-ts": "^2.0.0"
   },
   "browser": {
     "./dist/src/connection-manager/constants.js": "./dist/src/connection-manager/constants.browser.js",

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

@@ -5,6 +5,7 @@ import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 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, DefaultAddressManager } from '../../src/address-manager/index.js'
 import type { Libp2pEvents } from '@libp2p/interface'
@@ -23,8 +24,7 @@ describe('Address Manager', () => {
   beforeEach(async () => {
     peerId = await createEd25519PeerId()
     peerStore = stubInterface<PeerStore>({
-      // @ts-expect-error incorrect return type
-      patch: Promise.resolve({})
+      patch: Sinon.stub().resolves({})
     })
     events = new TypedEventEmitter()
   })
@@ -147,7 +147,7 @@ describe('Address Manager', () => {
     const am = new DefaultAddressManager({
       peerId,
       transportManager: stubInterface<TransportManager>({
-        getAddrs: []
+        getAddrs: Sinon.stub().returns([])
       }),
       peerStore,
       events

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

@@ -69,8 +69,8 @@ describe('auto-dial', () => {
     await peerStore.save(peerWithoutAddress.id, peerWithoutAddress)
 
     const connectionManager = stubInterface<ConnectionManager>({
-      getConnectionsMap: new PeerMap(),
-      getDialQueue: []
+      getConnectionsMap: Sinon.stub().returns(new PeerMap()),
+      getDialQueue: Sinon.stub().returns([])
     })
 
     autoDialler = new AutoDial({
@@ -123,8 +123,8 @@ describe('auto-dial', () => {
     connectionMap.set(connectedPeer.id, [stubInterface<Connection>()])
 
     const connectionManager = stubInterface<ConnectionManager>({
-      getConnectionsMap: connectionMap,
-      getDialQueue: []
+      getConnectionsMap: Sinon.stub().returns(connectionMap),
+      getDialQueue: Sinon.stub().returns([])
     })
 
     autoDialler = new AutoDial({
@@ -172,13 +172,13 @@ describe('auto-dial', () => {
     await peerStore.save(peerNotInDialQueue.id, peerNotInDialQueue)
 
     const connectionManager = stubInterface<ConnectionManager>({
-      getConnectionsMap: new PeerMap(),
-      getDialQueue: [{
+      getConnectionsMap: Sinon.stub().returns(new PeerMap()),
+      getDialQueue: Sinon.stub().returns([{
         id: 'foo',
         peerId: peerInDialQueue.id,
         multiaddrs: [],
         status: 'queued'
-      }]
+      }])
     })
 
     autoDialler = new AutoDial({
@@ -203,8 +203,8 @@ describe('auto-dial', () => {
     const peerStoreAllSpy = Sinon.spy(peerStore, 'all')
 
     const connectionManager = stubInterface<ConnectionManager>({
-      getConnectionsMap: new PeerMap(),
-      getDialQueue: []
+      getConnectionsMap: Sinon.stub().returns(new PeerMap()),
+      getDialQueue: Sinon.stub().returns([])
     })
 
     autoDialler = new AutoDial({
@@ -254,8 +254,8 @@ describe('auto-dial', () => {
     await peerStore.save(undialablePeer.id, undialablePeer)
 
     const connectionManager = stubInterface<ConnectionManager>({
-      getConnectionsMap: new PeerMap(),
-      getDialQueue: []
+      getConnectionsMap: Sinon.stub().returns(new PeerMap()),
+      getDialQueue: Sinon.stub().returns([])
     })
 
     autoDialler = new AutoDial({

packages/libp2p/test/connection-manager/direct.node.ts

@@ -22,7 +22,7 @@ import { pipe } from 'it-pipe'
 import { pushable } from 'it-pushable'
 import pDefer from 'p-defer'
 import pWaitFor from 'p-wait-for'
-import sinon from 'sinon'
+import Sinon from 'sinon'
 import { stubInterface } from 'sinon-ts'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import { DefaultAddressManager } from '../../src/address-manager/index.js'
@@ -49,10 +49,10 @@ describe('dialing (direct, TCP)', () => {
   let remoteAddr: Multiaddr
   let remoteComponents: Components
   let localComponents: Components
-  let resolver: sinon.SinonStub<[Multiaddr], Promise<string[]>>
+  let resolver: Sinon.SinonStub<[Multiaddr], Promise<string[]>>
 
   beforeEach(async () => {
-    resolver = sinon.stub<[Multiaddr], Promise<string[]>>()
+    resolver = Sinon.stub<[Multiaddr], Promise<string[]>>()
     const [localPeerId, remotePeerId] = await Promise.all([
       createEd25519PeerId(),
       createEd25519PeerId()
@@ -66,7 +66,7 @@ describe('dialing (direct, TCP)', () => {
       upgrader: mockUpgrader({ events: remoteEvents }),
       connectionGater: mockConnectionGater(),
       transportManager: stubInterface<TransportManager>({
-        getAddrs: []
+        getAddrs: Sinon.stub().returns([])
       })
     })
     remoteComponents.peerStore = new PersistentPeerStore(remoteComponents)
@@ -109,7 +109,7 @@ describe('dialing (direct, TCP)', () => {
   })
 
   afterEach(() => {
-    sinon.restore()
+    Sinon.restore()
   })
 
   it('should be able to connect to a remote node via its multiaddr', async () => {
@@ -194,7 +194,7 @@ describe('dialing (direct, TCP)', () => {
 
     const dialer = new DialQueue(localComponents)
 
-    sinon.spy(localTM, 'dial')
+    Sinon.spy(localTM, 'dial')
     const connection = await dialer.dial(peerId)
     expect(localTM.dial).to.have.property('callCount', remoteAddrs.length)
     expect(connection).to.exist()
@@ -207,7 +207,7 @@ describe('dialing (direct, TCP)', () => {
       dialTimeout: 50
     })
 
-    sinon.stub(localTM, 'dial').callsFake(async (addr, options = {}) => {
+    Sinon.stub(localTM, 'dial').callsFake(async (addr, options = {}) => {
       expect(options.signal).to.exist()
       expect(options.signal?.aborted).to.equal(false)
       expect(addr.toString()).to.eql(remoteAddr.toString())
@@ -235,7 +235,7 @@ describe('dialing (direct, TCP)', () => {
     })
 
     const deferredDial = pDefer<Connection>()
-    const transportManagerDialStub = sinon.stub(localTM, 'dial')
+    const transportManagerDialStub = Sinon.stub(localTM, 'dial')
     transportManagerDialStub.callsFake(async () => deferredDial.promise)
 
     // Perform 3 multiaddr dials
@@ -273,7 +273,7 @@ describe('dialing (direct, TCP)', () => {
       maxParallelDialsPerPeer: 10
     })
 
-    const transportManagerDialStub = sinon.stub(localTM, 'dial')
+    const transportManagerDialStub = Sinon.stub(localTM, 'dial')
     transportManagerDialStub.callsFake(async (ma) => {
       await delay(10)
       return mockConnection(mockMultiaddrConnection(mockDuplex(), remoteComponents.peerId))
@@ -340,7 +340,7 @@ describe('libp2p.dialer (direct, TCP)', () => {
   })
 
   afterEach(async () => {
-    sinon.restore()
+    Sinon.restore()
 
     if (libp2p != null) {
       await libp2p.stop()
@@ -515,7 +515,7 @@ describe('libp2p.dialer (direct, TCP)', () => {
       connectionProtector: () => protector
     })
 
-    const protectorProtectSpy = sinon.spy(protector, 'protect')
+    const protectorProtectSpy = Sinon.spy(protector, 'protect')
 
     remoteLibp2p.components.connectionProtector = preSharedKey({ psk: swarmKeyBuffer })()
 
@@ -589,7 +589,7 @@ describe('libp2p.dialer (direct, TCP)', () => {
 
     const dials = 10
     const error = new Error('Boom')
-    sinon.stub(libp2p.components.transportManager, 'dial').callsFake(async () => Promise.reject(error))
+    Sinon.stub(libp2p.components.transportManager, 'dial').callsFake(async () => Promise.reject(error))
 
     await libp2p.peerStore.patch(remotePeerId, {
       multiaddrs: remoteLibp2p.getMultiaddrs()

packages/peer-discovery-bootstrap/package.json

@@ -58,6 +58,6 @@
   "devDependencies": {
     "@libp2p/interface-compliance-tests": "^4.1.2",
     "aegir": "^41.0.2",
-    "sinon-ts": "^1.0.0"
+    "sinon-ts": "^2.0.0"
   }
 }

packages/transport-webrtc/package.json

@@ -89,7 +89,7 @@
     "p-retry": "^6.1.0",
     "protons": "^7.0.2",
     "sinon": "^17.0.0",
-    "sinon-ts": "^1.0.0"
+    "sinon-ts": "^2.0.0"
   },
   "browser": {
     "./dist/src/webrtc/index.js": "./dist/src/webrtc/index.browser.js"

packages/transport-webrtc/test/listener.spec.ts

@@ -1,6 +1,7 @@
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 import { multiaddr } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
+import Sinon from 'sinon'
 import { stubInterface } from 'sinon-ts'
 import { WebRTCPeerListener } from '../src/private-to-private/listener.js'
 import type { Listener } from '@libp2p/interface/transport'
@@ -21,11 +22,11 @@ describe('webrtc private-to-private listener', () => {
     })
 
     const otherListener = stubInterface<Listener>({
-      getAddrs: [multiaddr(otherListenAddress)]
+      getAddrs: Sinon.stub().returns([multiaddr(otherListenAddress)])
     })
 
     const relayListener = stubInterface<Listener>({
-      getAddrs: [multiaddr(relayedAddress)]
+      getAddrs: Sinon.stub().returns([multiaddr(relayedAddress)])
     })
 
     transportManager.getListeners.returns([