test: refactor tests + updated config (libp2p#1573)

maschad · Jul 5, 2023 · f86432a · f86432a
1 parent df1ba0e
commit f86432a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/packages/libp2p/src/connection-manager/utils.ts b/packages/libp2p/src/connection-manager/utils.ts
@@ -92,7 +92,7 @@ export const validateConnectionManagerConfig = (opts: ConnectionManagerInit): Ob
     inboundUpgradeTimeout: number().integer().default(INBOUND_UPGRADE_TIMEOUT),
     allow: array().of(string()).test('is multiaddr', validateMultiaddr).optional(),
     deny: array().of(string()).test('is multiaddr', validateMultiaddr).optional(),
-    inboundConnectionThreshold: number().max(opts?.maxConnections ?? MAX_CONNECTIONS, `inboundConnectionThreshold must be less than the max connections limit: ${opts?.maxConnections}`).integer().default(INBOUND_CONNECTION_THRESHOLD),
-    maxIncomingPendingConnections: number().integer().max(opts?.maxConnections ?? MAX_CONNECTIONS, `maxIncomingPendingConnections must be less than the max connections limit: ${opts?.maxConnections}`).default(MAX_INCOMING_PENDING_CONNECTIONS)
+    inboundConnectionThreshold: number().max(opts?.maxConnections ?? MAX_CONNECTIONS, `inboundConnectionThreshold must be less than the max connections limit: ${opts?.inboundConnectionThreshold}`).integer().default(INBOUND_CONNECTION_THRESHOLD),
+    maxIncomingPendingConnections: number().integer().max(opts?.maxConnections ?? MAX_CONNECTIONS, `maxIncomingPendingConnections must be less than the max connections limit: ${opts?.maxIncomingPendingConnections}`).default(MAX_INCOMING_PENDING_CONNECTIONS)
   })
 }
diff --git a/packages/libp2p/src/fetch/index.ts b/packages/libp2p/src/fetch/index.ts
@@ -101,7 +101,7 @@ class DefaultFetchService implements Startable, FetchService {
   constructor (components: FetchServiceComponents, init: FetchServiceInit) {
     this.started = false
     this.components = components
-    this.protocol = `/${init.protocolPrefix ?? 'libp2p'}/${PROTOCOL_NAME}/${PROTOCOL_VERSION}`
+    this.protocol = `/${init.protocolPrefix}/${PROTOCOL_NAME}/${PROTOCOL_VERSION}`
     this.lookupFunctions = new Map() // Maps key prefix to value lookup function
     this.handleMessage = this.handleMessage.bind(this)
     this.init = init
@@ -311,7 +311,7 @@ class DefaultFetchService implements Startable, FetchService {
 
 export function fetchService (init: FetchServiceInit = {}): (components: FetchServiceComponents) => FetchService {
   const validatedConfig = object({
-    protocolPrefix: string().default('ipfs'),
+    protocolPrefix: string().default('libp2p'),
     timeout: number().integer().default(TIMEOUT),
     maxInboundStreams: number().integer().min(0).default(MAX_INBOUND_STREAMS),
     maxOutboundStreams: number().integer().min(0).default(MAX_OUTBOUND_STREAMS)

diff --git a/packages/libp2p/test/configuration/protocol-prefix.node.ts b/packages/libp2p/test/configuration/protocol-prefix.node.ts
@@ -67,7 +67,8 @@ describe('Protocol prefix is configurable', () => {
       '/ipfs/id/1.0.0',
       '/ipfs/id/push/1.0.0',
       '/ipfs/ping/1.0.0',
-      '/libp2p/fetch/0.0.1'
+      '/libp2p/fetch/0.0.1',
+      '/libp2p/circuit/relay/0.2.0/stop'
     ])
   })
 })
diff --git a/packages/libp2p/test/connection-manager/index.node.ts b/packages/libp2p/test/connection-manager/index.node.ts
@@ -236,7 +236,9 @@ describe('libp2p.connections', () => {
           },
           connectionManager: {
             minConnections,
-            maxConnections: 1
+            maxConnections: 1,
+            inboundConnectionThreshold: 1,
+            maxIncomingPendingConnections: 1
           }
         }
       })

diff --git a/packages/libp2p/test/ping/ping.node.ts b/packages/libp2p/test/ping/ping.node.ts
@@ -9,6 +9,7 @@ import { pingService, type PingService } from '../../src/ping/index.js'
 import { createBaseOptions } from '../fixtures/base-options.js'
 import { createNode, populateAddressBooks } from '../fixtures/creators/peer.js'
 import type { Libp2p } from '@libp2p/interface'
+import { identifyService } from '../../src/identify/index.js'
 
 describe('ping', () => {
   let nodes: Array<Libp2p<{ ping: PingService }>>
@@ -18,20 +19,23 @@ describe('ping', () => {
       createNode({
         config: createBaseOptions({
           services: {
+            identify: identifyService(),
             ping: pingService()
           }
         })
       }),
       createNode({
         config: createBaseOptions({
           services: {
+            identify: identifyService(),
             ping: pingService()
           }
         })
       }),
       createNode({
         config: createBaseOptions({
           services: {
+            identify: identifyService(),
             ping: pingService()
           }
         })
@@ -104,6 +108,7 @@ describe('ping', () => {
     const client = await createNode({
       config: createBaseOptions({
         services: {
+          identify: identifyService(),
           ping: pingService({
             // Allow two outbound ping streams.
             // It is not allowed by the spec, but this test needs to open two concurrent streams.

diff --git a/packages/transport-webrtc/.aegir.js b/packages/transport-webrtc/.aegir.js
@@ -1,4 +1,3 @@
-
 /** @type {import('aegir').PartialOptions} */
 export default {
   build: {
@@ -35,7 +34,7 @@ export default {
         services: {
           relay: circuitRelayServer({
             reservations: {
-              maxReservations: Infinity
+              maxReservations: 10000
             }
           }),
           identify: identifyService()