@libp2p/interface-compliance-tests 6.1.8 → 6.1.9

package/src/matchers.ts

@@ -2,10 +2,16 @@ import Sinon from 'sinon'
 import type { PeerId } from '@libp2p/interface'
 import type { Multiaddr } from '@multiformats/multiaddr'
 
+/**
+ * @deprecated PeerIds can be passed to sinon matchers directly
+ */
 export function matchPeerId (peerId: PeerId): Sinon.SinonMatcher {
   return Sinon.match(p => p.toString() === peerId.toString())
 }
 
+/**
+ * @deprecated Multiaddrs can be passed to sinon matchers directly
+ */
 export function matchMultiaddr (ma: Multiaddr): Sinon.SinonMatcher {
   return Sinon.match(m => m.toString() === ma.toString())
 }

package/src/mocks/index.ts

@@ -1,4 +1,3 @@
-export { mockConnectionGater } from './connection-gater.js'
 export { mockConnectionManager, mockNetwork } from './connection-manager.js'
 export { mockConnection, mockStream, streamPair, connectionPair } from './connection.js'
 export { mockMultiaddrConnection, mockMultiaddrConnPair } from './multiaddr-connection.js'
@@ -6,7 +5,6 @@ export { mockMuxer } from './muxer.js'
 export { mockRegistrar } from './registrar.js'
 export { mockUpgrader } from './upgrader.js'
 export { mockDuplex } from './duplex.js'
-export { mockMetrics } from './metrics.js'
 export type { MockUpgraderInit } from './upgrader.js'
 export type { MockNetworkComponents, MockConnectionManagerComponents, MockNetwork } from './connection-manager.js'
 export type { MockConnectionOptions, StreamInit, StreamPairInit } from './connection.js'

package/src/mocks/muxer.ts

@@ -27,9 +27,15 @@ interface ResetMessage {
   direction: Direction
 }
 
-interface CloseMessage {
+interface CloseWriteMessage {
   id: string
-  type: 'close'
+  type: 'closeWrite'
+  direction: Direction
+}
+
+interface CloseReadMessage {
+  id: string
+  type: 'closeRead'
   direction: Direction
 }
 
@@ -39,7 +45,7 @@ interface CreateMessage {
   direction: 'outbound'
 }
 
-type StreamMessage = DataMessage | ResetMessage | CloseMessage | CreateMessage
+type StreamMessage = DataMessage | ResetMessage | CloseWriteMessage | CloseReadMessage | CreateMessage
 
 export interface MockMuxedStreamInit extends AbstractStreamInit {
   push: Pushable<StreamMessage>
@@ -84,16 +90,21 @@ class MuxedStream extends AbstractStream {
   }
 
   sendCloseWrite (): void {
-    const closeMsg: CloseMessage = {
+    const closeMsg: CloseWriteMessage = {
       id: this.id,
-      type: 'close',
+      type: 'closeWrite',
       direction: this.direction
     }
     this.push.push(closeMsg)
   }
 
   sendCloseRead (): void {
-    // does not support close read, only close write
+    const closeMsg: CloseReadMessage = {
+      id: this.id,
+      type: 'closeRead',
+      direction: this.direction
+    }
+    this.push.push(closeMsg)
   }
 }
 
@@ -153,10 +164,10 @@ class MockMuxer implements StreamMuxer {
         }
       )
 
-      this.log('muxed stream ended')
+      this.log('muxer ended')
       this.input.end()
     } catch (err: any) {
-      this.log('muxed stream errored', err)
+      this.log.error('muxer errored - %e', err)
       this.input.end(err)
     }
   }
@@ -192,9 +203,12 @@ class MockMuxer implements StreamMuxer {
     } else if (message.type === 'reset') {
       this.log('-> reset stream %s %s', muxedStream.direction, muxedStream.id)
       muxedStream.reset()
-    } else if (message.type === 'close') {
-      this.log('-> closing stream %s %s', muxedStream.direction, muxedStream.id)
+    } else if (message.type === 'closeWrite') {
+      this.log('-> closing writeable end of stream %s %s', muxedStream.direction, muxedStream.id)
       muxedStream.remoteCloseWrite()
+    } else if (message.type === 'closeRead') {
+      this.log('-> closing readable end of stream %s %s', muxedStream.direction, muxedStream.id)
+      muxedStream.remoteCloseRead()
     }
   }
 

package/src/mocks/upgrader.ts

@@ -28,7 +28,7 @@ class MockUpgrader implements Upgrader {
     return connection
   }
 
-  async upgradeInbound (multiaddrConnection: MultiaddrConnection, opts: UpgraderOptions = {}): Promise<Connection> {
+  async upgradeInbound (multiaddrConnection: MultiaddrConnection, opts: UpgraderOptions = {}): Promise<void> {
     const connection = mockConnection(multiaddrConnection, {
       direction: 'inbound',
       registrar: this.registrar,
@@ -36,8 +36,6 @@ class MockUpgrader implements Upgrader {
     })
 
     this.events?.safeDispatchEvent('connection:open', { detail: connection })
-
-    return connection
   }
 }