@streamr/dht 0.0.1-tatum.1 → 0.0.1-tatum.3

package/src/proto/packages/dht/protos/DhtRpc.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.8.2 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/dht/protos/DhtRpc.proto" (package "dht", syntax proto3)
 // tslint:disable
 import { Empty } from "../../../google/protobuf/empty";
@@ -240,48 +240,18 @@ export interface PeerDescriptor {
  * @generated from protobuf message dht.ConnectivityMethod
  */
 export interface ConnectivityMethod {
-    /**
-     * @generated from protobuf field: uint32 port = 2;
-     */
-    port: number;
-    /**
-     * @generated from protobuf field: string ip = 3;
-     */
-    ip: string;
-}
-/**
- * @generated from protobuf message dht.ConnectivityReportRequest
- */
-export interface ConnectivityReportRequest {
     /**
      * @generated from protobuf field: uint32 port = 1;
      */
     port: number;
     /**
-     * @generated from protobuf field: string requestId = 2;
+     * @generated from protobuf field: string host = 2;
      */
-    requestId: string;
-}
-/**
- * @generated from protobuf message dht.ConnectivityReportResponse
- */
-export interface ConnectivityReportResponse {
-    /**
-     * @generated from protobuf field: string open_internet = 1;
-     */
-    openInternet: string;
-    /**
-     * @generated from protobuf field: string ip = 2;
-     */
-    ip: string;
-    /**
-     * @generated from protobuf field: string natType = 3;
-     */
-    natType: string;
+    host: string;
     /**
-     * @generated from protobuf field: string requestId = 4;
+     * @generated from protobuf field: bool tls = 3;
      */
-    requestId: string;
+    tls: boolean;
 }
 /**
  * @generated from protobuf message dht.RouteMessageWrapper
@@ -347,6 +317,14 @@ export interface ConnectivityRequest {
      * @generated from protobuf field: uint32 port = 1;
      */
     port: number;
+    /**
+     * @generated from protobuf field: bool tls = 2;
+     */
+    tls: boolean;
+    /**
+     * @generated from protobuf field: optional string host = 3;
+     */
+    host?: string;
 }
 /**
  * @generated from protobuf message dht.ConnectivityResponse
@@ -357,9 +335,9 @@ export interface ConnectivityResponse {
      */
     openInternet: boolean;
     /**
-     * @generated from protobuf field: string ip = 2;
+     * @generated from protobuf field: string host = 2;
      */
-    ip: string;
+    host: string;
     /**
      * @generated from protobuf field: string natType = 3;
      */
@@ -1007,8 +985,9 @@ export const PeerDescriptor = new PeerDescriptor$Type();
 class ConnectivityMethod$Type extends MessageType$<ConnectivityMethod> {
     constructor() {
         super("dht.ConnectivityMethod", [
-            { no: 2, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 3, name: "ip", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 1, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 2, name: "host", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 3, name: "tls", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
 }
@@ -1017,34 +996,6 @@ class ConnectivityMethod$Type extends MessageType$<ConnectivityMethod> {
  */
 export const ConnectivityMethod = new ConnectivityMethod$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class ConnectivityReportRequest$Type extends MessageType$<ConnectivityReportRequest> {
-    constructor() {
-        super("dht.ConnectivityReportRequest", [
-            { no: 1, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 2, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message dht.ConnectivityReportRequest
- */
-export const ConnectivityReportRequest = new ConnectivityReportRequest$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class ConnectivityReportResponse$Type extends MessageType$<ConnectivityReportResponse> {
-    constructor() {
-        super("dht.ConnectivityReportResponse", [
-            { no: 1, name: "open_internet", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "ip", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "natType", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 4, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message dht.ConnectivityReportResponse
- */
-export const ConnectivityReportResponse = new ConnectivityReportResponse$Type();
-// @generated message type with reflection information, may provide speed optimized methods
 class RouteMessageWrapper$Type extends MessageType$<RouteMessageWrapper> {
     constructor() {
         super("dht.RouteMessageWrapper", [
@@ -1081,7 +1032,9 @@ export const RouteMessageAck = new RouteMessageAck$Type();
 class ConnectivityRequest$Type extends MessageType$<ConnectivityRequest> {
     constructor() {
         super("dht.ConnectivityRequest", [
-            { no: 1, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
+            { no: 1, name: "port", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 2, name: "tls", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
+            { no: 3, name: "host", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
         ]);
     }
 }
@@ -1094,7 +1047,7 @@ class ConnectivityResponse$Type extends MessageType$<ConnectivityResponse> {
     constructor() {
         super("dht.ConnectivityResponse", [
             { no: 1, name: "open_internet", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "ip", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "host", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 3, name: "natType", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 4, name: "websocket", kind: "message", T: () => ConnectivityMethod }
         ]);

package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.8.2 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.1 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/proto-rpc/protos/ProtoRpc.proto" (package "protorpc", syntax proto3)
 // tslint:disable
 import { MessageType } from "@protobuf-ts/runtime";

package/test/benchmark/KademliaCorrectness.test.ts

@@ -86,7 +86,7 @@ describe('Kademlia correctness', () => {
                     correctNeighbors++
                 }
             } catch (e) {
-                console.error('Node ' + nodes[i].getNodeName() + ' had only ' + kademliaNeighbors.length + ' kademlia neighbors')
+                console.error('Node ' + nodes[i].getPeerDescriptor().nodeName + ' had only ' + kademliaNeighbors.length + ' kademlia neighbors')
             }
             if (correctNeighbors === 0) {
                 console.log('No correct neighbors found for node ' + i)

package/test/benchmark/RecursiveFind.test.ts

@@ -70,7 +70,7 @@ describe('Recursive find correctness', () => {
         debugVars['waiting'] = false
         logger.info('waiting over')
 
-        nodes.forEach((node) => logger.info(node.getNodeName() + ': connections:' +
+        nodes.forEach((node) => logger.info(node.getPeerDescriptor().nodeName + ': connections:' +
             node.getNumberOfConnections() + ', kbucket: ' + node.getBucketSize()
             + ', localLocked: ' + node.getNumberOfLocalLockedConnections()
             + ', remoteLocked: ' + node.getNumberOfRemoteLockedConnections()

package/test/end-to-end/Layer0-Layer1.test.ts

@@ -6,7 +6,7 @@ describe('Layer0-Layer1', () => {
     const epPeerDescriptor: PeerDescriptor = {
         kademliaId: Uint8Array.from([1, 2, 3]),
         type: NodeType.NODEJS,
-        websocket: { ip: '127.0.0.1', port: 10016 }
+        websocket: { host: '127.0.0.1', port: 10016, tls: false }
     }
 
     const STREAM_ID1 = 'stream1'
@@ -29,8 +29,8 @@ describe('Layer0-Layer1', () => {
         await epDhtNode.start()
         await epDhtNode.joinDht([epPeerDescriptor])
 
-        node1 = new DhtNode({ peerIdString: '1', websocketPortRange, entryPoints: [epPeerDescriptor] })
-        node2 = new DhtNode({ peerIdString: '2', websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node1 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node2 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
 
         await node1.start()
         await node2.start()

package/test/end-to-end/Layer0.test.ts

@@ -6,7 +6,7 @@ describe('Layer0', () => {
     const epPeerDescriptor: PeerDescriptor = {
         kademliaId: Uint8Array.from([1, 2, 3]),
         type: NodeType.NODEJS,
-        websocket: { ip: '127.0.0.1', port: 10011 }
+        websocket: { host: '127.0.0.1', port: 10011, tls: false }
     }
     
     let epDhtNode: DhtNode
@@ -23,10 +23,10 @@ describe('Layer0', () => {
         
         await epDhtNode.joinDht([epPeerDescriptor])
 
-        node1 = new DhtNode({ peerIdString: '1', websocketPortRange, entryPoints: [epPeerDescriptor] })
-        node2 = new DhtNode({ peerIdString: '2', websocketPortRange, entryPoints: [epPeerDescriptor] })
-        node3 = new DhtNode({ peerIdString: '3', websocketPortRange, entryPoints: [epPeerDescriptor] })
-        node4 = new DhtNode({ peerIdString: '4', websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node1 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node2 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node3 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node4 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
         
         await node1.start()
         await node2.start()

package/test/end-to-end/Layer0MixedConnectionTypes.test.ts

@@ -8,7 +8,7 @@ describe('Layer0MixedConnectionTypes', () => {
     const epPeerDescriptor: PeerDescriptor = {
         kademliaId: Uint8Array.from([1, 2, 3]),
         type: NodeType.NODEJS,
-        websocket: { ip: '127.0.0.1', port: 11221 }
+        websocket: { host: '127.0.0.1', port: 11221, tls: false }
     }
 
     let epDhtNode: DhtNode
@@ -25,11 +25,11 @@ describe('Layer0MixedConnectionTypes', () => {
         await epDhtNode.start()
 
         await epDhtNode.joinDht([epPeerDescriptor])
-        node1 = new DhtNode({ peerIdString: 'Peer1', websocketPortRange, entryPoints: [epPeerDescriptor] })
-        node2 = new DhtNode({ peerIdString: 'Peer2', websocketPortRange, entryPoints: [epPeerDescriptor] })
-        node3 = new DhtNode({ peerIdString: 'Peer3', entryPoints: [epPeerDescriptor] })
-        node4 = new DhtNode({ peerIdString: 'Peer4', entryPoints: [epPeerDescriptor] })
-        node5 = new DhtNode({ peerIdString: 'Peer5', entryPoints: [epPeerDescriptor] })
+        node1 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node2 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        node3 = new DhtNode({ entryPoints: [epPeerDescriptor] })
+        node4 = new DhtNode({ entryPoints: [epPeerDescriptor] })
+        node5 = new DhtNode({ entryPoints: [epPeerDescriptor] })
 
         await Promise.all([
             node1.start(),

package/test/end-to-end/Layer0WebRTC-Layer1.test.ts

@@ -1,16 +1,15 @@
+import { binaryToHex } from '@streamr/utils'
 import { DhtNode } from '../../src/dht/DhtNode'
 import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { PeerID } from '../../src/exports'
 
 describe('Layer 1 on Layer 0 with mocked connections', () => {
-    const entryPointId = '00000'
-
     const entrypointDescriptor: PeerDescriptor = {
-        kademliaId: PeerID.fromString(entryPointId).value,
+        kademliaId: new Uint8Array([0]),
         type: NodeType.NODEJS,
         websocket: {
-            ip: '127.0.0.1',
-            port: 23232
+            host: '127.0.0.1',
+            port: 23232,
+            tls: false
         }
     }
 
@@ -33,52 +32,52 @@ describe('Layer 1 on Layer 0 with mocked connections', () => {
 
         layer0EntryPoint = new DhtNode({ peerDescriptor: entrypointDescriptor })
 
-        const layer0Node1Id = 'layer0Node1'
+        const layer0Node1Id = '11'
         layer0Node1 = new DhtNode({
-            peerIdString: layer0Node1Id
+            peerId: layer0Node1Id
         })
 
-        const layer0Node2Id = 'layer0Node2'
+        const layer0Node2Id = '22'
         layer0Node2 = new DhtNode({
-            peerIdString: layer0Node2Id
+            peerId: layer0Node2Id
         })
 
-        const layer0Node3Id = 'layer0Node3'
+        const layer0Node3Id = '33'
         layer0Node3 = new DhtNode({
-            peerIdString: layer0Node3Id
+            peerId: layer0Node3Id
         })
 
-        const layer0Node4Id = 'layer0Node4'
+        const layer0Node4Id = '44'
         layer0Node4 = new DhtNode({
-            peerIdString: layer0Node4Id
+            peerId: layer0Node4Id
         })
 
         layer1EntryPoint = new DhtNode({
-            peerIdString: entryPointId,
+            peerId: binaryToHex(entrypointDescriptor.kademliaId),
             transportLayer: layer0EntryPoint,
             serviceId: 'layer1'
         })
 
         layer1Node1 = new DhtNode({
-            peerIdString: layer0Node1Id,
+            peerId: layer0Node1Id,
             transportLayer: layer0Node1,
             serviceId: 'layer1'
         })
 
         layer1Node2 = new DhtNode({
-            peerIdString: layer0Node2Id,
+            peerId: layer0Node2Id,
             transportLayer: layer0Node2,
             serviceId: 'layer1'
         })
 
         layer1Node3 = new DhtNode({
-            peerIdString: layer0Node3Id,
+            peerId: layer0Node3Id,
             transportLayer: layer0Node3,
             serviceId: 'layer1'
         })
 
         layer1Node4 = new DhtNode({
-            peerIdString: layer0Node4Id,
+            peerId: layer0Node4Id,
             transportLayer: layer0Node4,
             serviceId: 'layer1'
         })

package/test/end-to-end/Layer0WebRTC.test.ts

@@ -1,17 +1,16 @@
-import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { areEqualBinaries, waitForEvent3 } from '@streamr/utils'
+import { ConnectionManager } from '../../src/connection/ConnectionManager'
+import { ConnectionType } from '../../src/connection/IConnection'
 import { DhtNode } from '../../src/dht/DhtNode'
 import { PeerID } from '../../src/helpers/PeerID'
-import { ConnectionType } from '../../src/connection/IConnection'
-import { ConnectionManager } from '../../src/connection/ConnectionManager'
-import EventEmitter from 'events'
-import { waitForEvent } from '@streamr/utils'
+import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 
 describe('Layer0 with WebRTC connections', () => {
     const epPeerDescriptor: PeerDescriptor = {
         kademliaId: PeerID.fromString('entrypoint').value,
         nodeName: 'entrypoint',
         type: NodeType.NODEJS,
-        websocket: { ip: '127.0.0.1', port: 10029 }
+        websocket: { host: '127.0.0.1', port: 10029, tls: false }
     }
     let epDhtNode: DhtNode
     let node1: DhtNode
@@ -26,10 +25,10 @@ describe('Layer0 with WebRTC connections', () => {
 
         await epDhtNode.joinDht([epPeerDescriptor])
 
-        node1 = new DhtNode({ peerIdString: 'Peer0', nodeName: 'Peer0', entryPoints: [epPeerDescriptor] })
-        node2 = new DhtNode({ peerIdString: 'Peer1', nodeName: 'Peer1', entryPoints: [epPeerDescriptor] })
-        node3 = new DhtNode({ peerIdString: 'Peer2', nodeName: 'Peer2', entryPoints: [epPeerDescriptor] })
-        node4 = new DhtNode({ peerIdString: 'Peer3', nodeName: 'Peer3', entryPoints: [epPeerDescriptor] })
+        node1 = new DhtNode({ nodeName: 'Peer0', entryPoints: [epPeerDescriptor] })
+        node2 = new DhtNode({ nodeName: 'Peer1', entryPoints: [epPeerDescriptor] })
+        node3 = new DhtNode({ nodeName: 'Peer2', entryPoints: [epPeerDescriptor] })
+        node4 = new DhtNode({ nodeName: 'Peer3', entryPoints: [epPeerDescriptor] })
 
         await Promise.all([
             node1.start(),
@@ -51,22 +50,17 @@ describe('Layer0 with WebRTC connections', () => {
         await epDhtNode.stop()
     })
 
-    class Peer0Listener extends EventEmitter {
-        private nodeToListen: DhtNode
-        constructor(nodeToListen: DhtNode) {
-            super()
-            this.nodeToListen = nodeToListen
-            this.nodeToListen.on('connected', (peer: PeerDescriptor) => {
-                if (PeerID.fromValue(peer.kademliaId).equals(PeerID.fromString('Peer0'))) {
-                    this.emit('peer0connected')
-                }
-            })
-        }
-    }
-
     it('Happy path two peers', async () => {
 
-        await Promise.all([waitForEvent(new Peer0Listener(node2), 'peer0connected', 20000),
+        await Promise.all([
+            waitForEvent3<any>(
+                node2 as any,
+                'connected',
+                20000,
+                (peerDescriptor: PeerDescriptor) => {
+                    return areEqualBinaries(peerDescriptor.kademliaId, node1.getPeerDescriptor().kademliaId)
+                }
+            ),
             node2.joinDht([epPeerDescriptor]),
             node1.joinDht([epPeerDescriptor])
         ])

package/test/end-to-end/Layer1-Scale-WebRTC.test.ts

@@ -6,7 +6,7 @@ describe('Layer1 Scale', () => {
     const epPeerDescriptor: PeerDescriptor = {
         kademliaId: PeerID.fromString('0').value,
         type: NodeType.NODEJS,
-        websocket: { ip: '127.0.0.1', port: 43228 },
+        websocket: { host: '127.0.0.1', port: 43228, tls: false },
         nodeName: 'entrypoint'
     }
 
@@ -34,7 +34,7 @@ describe('Layer1 Scale', () => {
         layer1Nodes = []
 
         for (let i = 1; i < NUM_OF_NODES; i++) {
-            const node = new DhtNode({ peerIdString: `node-${i}`, nodeName: `${i}`, entryPoints: [epPeerDescriptor] })
+            const node = new DhtNode({ nodeName: `${i}`, entryPoints: [epPeerDescriptor] })
             await node.start()
             layer0Nodes.push(node)
             const layer1 = new DhtNode({

package/test/end-to-end/Layer1-Scale-WebSocket.test.ts

@@ -6,7 +6,7 @@ describe('Layer1 Scale', () => {
     const epPeerDescriptor: PeerDescriptor = {
         kademliaId: PeerID.fromString('entrypoint').value,
         type: NodeType.NODEJS,
-        websocket: { ip: '127.0.0.1', port: 43225 },
+        websocket: { host: '127.0.0.1', port: 43225, tls: false },
         nodeName: 'entrypoint'
     }
 
@@ -36,7 +36,7 @@ describe('Layer1 Scale', () => {
         layer1Nodes = []
 
         for (let i = 0; i < NUM_OF_NODES; i++) {
-            const node = new DhtNode({ peerIdString: `node-${i}`, nodeName: `${i}`, websocketPortRange, entryPoints: [epPeerDescriptor] })
+            const node = new DhtNode({ nodeName: `${i}`, websocketPortRange, entryPoints: [epPeerDescriptor] })
             await node.start()
             layer0Nodes.push(node)
             const layer1 = new DhtNode({

package/test/end-to-end/WebSocketConnectionRequest.test.ts

@@ -9,7 +9,7 @@ describe('WebSocket IConnection Requests', () => {
     const epPeerDescriptor: PeerDescriptor = {
         kademliaId: PeerID.fromString('3').value,
         type: NodeType.NODEJS,
-        websocket: { ip: '127.0.0.1', port: 10021 }
+        websocket: { host: '127.0.0.1', port: 10021, tls: false }
     }
     let epDhtNode: DhtNode
     let node1: DhtNode
@@ -22,8 +22,8 @@ describe('WebSocket IConnection Requests', () => {
 
         await epDhtNode.joinDht([epPeerDescriptor])
 
-        node1 = new DhtNode({ peerIdString: '2', nodeName: 'node1', websocketPortRange: { min: 10022, max: 10022 }, entryPoints: [epPeerDescriptor] })
-        node2 = new DhtNode({ peerIdString: '1', nodeName: 'node2', entryPoints: [epPeerDescriptor] })
+        node1 = new DhtNode({ nodeName: 'node1', websocketPortRange: { min: 10022, max: 10022 }, entryPoints: [epPeerDescriptor] })
+        node2 = new DhtNode({ nodeName: 'node2', entryPoints: [epPeerDescriptor] })
         await node1.start()
         await node2.start()
     })

package/test/integration/ConnectionManager.test.ts

@@ -8,6 +8,7 @@ import { Logger } from '@streamr/utils'
 
 const logger = new Logger(module)
 
+// TODO: refactor this test file to use beforeEach and AfterEach for proper teardown
 describe('ConnectionManager', () => {
     const serviceId = 'demo'
 
@@ -52,7 +53,7 @@ describe('ConnectionManager', () => {
         })
 
         await connectionManager.start((report) => {
-            expect(report.ip).toEqual('127.0.0.1')
+            expect(report.host).toEqual('127.0.0.1')
             expect(report.openInternet).toEqual(true)
             return createPeerDescriptor(report)
         })
@@ -66,7 +67,7 @@ describe('ConnectionManager', () => {
             transportLayer: mockTransport,
             websocketPortRange: { min: 9992, max: 9992 },
             entryPoints: [
-                { kademliaId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { ip: '127.0.0.1', port: 12345 } }
+                { kademliaId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { host: '127.0.0.1', port: 12345, tls: false } }
             ]
         })
 
@@ -85,7 +86,7 @@ describe('ConnectionManager', () => {
         })
 
         await connectionManager1.start((report) => {
-            expect(report.ip).toEqual('127.0.0.1')
+            expect(report.host).toEqual('127.0.0.1')
             expect(report.openInternet).toEqual(true)
             return createPeerDescriptor(report)
         })
@@ -94,12 +95,12 @@ describe('ConnectionManager', () => {
             transportLayer: mockConnectorTransport2,
             websocketPortRange: { min: 9994, max: 9994 },
             entryPoints: [
-                { kademliaId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { ip: '127.0.0.1', port: 9993 } }
+                { kademliaId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { host: '127.0.0.1', port: 9993, tls: false } }
             ]
         })
 
         await connectionManager2.start((report) => {
-            expect(report.ip).toEqual('127.0.0.1')
+            expect(report.host).toEqual('127.0.0.1')
             expect(report.openInternet).toEqual(true)
             return createPeerDescriptor(report)
         })
@@ -118,7 +119,7 @@ describe('ConnectionManager', () => {
         let peerDescriptor: PeerDescriptor | undefined
 
         await connectionManager1.start((report) => {
-            expect(report.ip).toEqual('127.0.0.1')
+            expect(report.host).toEqual('127.0.0.1')
             expect(report.openInternet).toEqual(true)
             peerDescriptor = createPeerDescriptor(report)
             return peerDescriptor
@@ -134,7 +135,7 @@ describe('ConnectionManager', () => {
 
         let peerDescriptor2: PeerDescriptor | undefined
         await connectionManager2.start((report2) => {
-            expect(report2.ip).toEqual('127.0.0.1')
+            expect(report2.host).toEqual('127.0.0.1')
             expect(report2.openInternet).toEqual(true)
             peerDescriptor2 = createPeerDescriptor(report2)
             return peerDescriptor2
@@ -187,7 +188,7 @@ describe('ConnectionManager', () => {
 
         let peerDescriptor: PeerDescriptor | undefined
         await connectionManager1.start((report) => {
-            expect(report.ip).toEqual('127.0.0.1')
+            expect(report.host).toEqual('127.0.0.1')
             expect(report.openInternet).toEqual(true)
             peerDescriptor = createPeerDescriptor(report)
             return peerDescriptor
@@ -316,7 +317,7 @@ describe('ConnectionManager', () => {
         })
 
         await connectionManager1.start((report) => {
-            expect(report.ip).toEqual('127.0.0.1')
+            expect(report.host).toEqual('127.0.0.1')
             expect(report.openInternet).toEqual(true)
             return createPeerDescriptor(report)
         })

package/test/integration/DhtRpc.test.ts

@@ -46,8 +46,8 @@ describe('DhtRpc', () => {
     })
 
     afterEach(async () => {
-        await rpcCommunicator1.stop()
-        await rpcCommunicator2.stop()
+        rpcCommunicator1.stop()
+        rpcCommunicator2.stop()
     })
 
     it('Happy path', async () => {

package/test/integration/MigrateData.test.ts

@@ -114,13 +114,13 @@ describe('Migrating data from node to node in DHT', () => {
                 hasDataMarker = '<-'
             }
 
-            logger.info(contact.getPeerDescriptor().nodeName + ' ' + node.getNodeName() + hasDataMarker)
+            logger.info(contact.getPeerDescriptor().nodeName + ' ' + node.getPeerDescriptor().nodeName + hasDataMarker)
         })
 
         logger.info(NUM_NODES + ' nodes joining layer0 DHT')
         await Promise.all(
             nodes.map((node) => {
-                if (node.getNodeName() != '0') {
+                if (node.getPeerDescriptor().nodeName != '0') {
                     node.joinDht([entrypointDescriptor])
                 }
             })
@@ -142,7 +142,7 @@ describe('Migrating data from node to node in DHT', () => {
                 hasDataMarker = '<-'
             }
 
-            logger.info('' + node.getNodeName() + hasDataMarker)
+            logger.info('' + node.getPeerDescriptor().nodeName + hasDataMarker)
         })
 
         const closestNode = nodesById.get(PeerID.fromValue(closest[0].getPeerDescriptor().kademliaId).toKey())!

package/test/integration/RouteMessage.test.ts

@@ -113,7 +113,7 @@ describe('Route Message With Mock Connections', () => {
                 sourceDescriptor: sourceNode.getPeerDescriptor(),
                 targetDescriptor: destinationNode.getPeerDescriptor()
             }
-            await sourceNode.router!.doRouteMessage({
+            sourceNode.router!.doRouteMessage({
                 message,
                 destinationPeer: destinationNode.getPeerDescriptor(),
                 requestId: v4(),
@@ -169,7 +169,7 @@ describe('Route Message With Mock Connections', () => {
                             sourceDescriptor: node.getPeerDescriptor(),
                             targetDescriptor: destinationNode.getPeerDescriptor()
                         }
-                        await node.router!.doRouteMessage({
+                        node.router!.doRouteMessage({
                             message,
                             destinationPeer: receiver.getPeerDescriptor(),
                             sourcePeer: node.getPeerDescriptor(),

package/test/integration/ScaleDownDht.test.ts

@@ -55,7 +55,7 @@ describe('Scaling down a Dht network', () => {
             const nodeIsCleaned = nodes.every((node) =>
                 node.getAllConnectionPeerDescriptors().every((peer) => {
                     if (isSamePeerDescriptor(peer, stoppingPeerDescriptor)) {
-                        logger.error(' ' + node.getNodeName() + ', ' + stoppingPeerDescriptor.nodeName + ' cleaning up failed')
+                        logger.error(' ' + node.getPeerDescriptor().nodeName + ', ' + stoppingPeerDescriptor.nodeName + ' cleaning up failed')
                     }
                     return !isSamePeerDescriptor(peer, stoppingPeerDescriptor)
                 })

package/test/integration/SimultaneousConnections.test.ts

@@ -87,8 +87,9 @@ describe('SimultaneousConnections', () => {
             nodeName: 'mock1WebSocket',
             type: NodeType.NODEJS,
             websocket: {
-                ip: '127.0.0.1',
-                port: 43432
+                host: '127.0.0.1',
+                port: 43432,
+                tls: false
             }
         }
 
@@ -97,8 +98,9 @@ describe('SimultaneousConnections', () => {
             nodeName: 'mock2WebSocket',
             type: NodeType.NODEJS,
             websocket: {
-                ip: '127.0.0.1',
-                port: 43433
+                host: '127.0.0.1',
+                port: 43433,
+                tls: false
             }
         }
 
@@ -170,8 +172,9 @@ describe('SimultaneousConnections', () => {
             nodeName: 'mock1WebSocketServer',
             type: NodeType.NODEJS,
             websocket: {
-                ip: '127.0.0.1',
-                port: 43432
+                host: '127.0.0.1',
+                port: 43432,
+                tls: false
             }
         }