@streamr/dht 100.0.0-testnet-three.6 → 100.1.0

package/test/integration/SimultaneousConnections.test.ts

@@ -3,7 +3,7 @@ import { ConnectionManager } from '../../src/connection/ConnectionManager'
 import { DefaultConnectorFacade, DefaultConnectorFacadeConfig } from '../../src/connection/ConnectorFacade'
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
 import { SimulatorTransport } from '../../src/connection/simulator/SimulatorTransport'
-import { Message, MessageType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { Message, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 import { getRandomRegion } from '../../src/connection/simulator/pings'
@@ -12,7 +12,6 @@ import { getNodeIdFromPeerDescriptor } from '../../src/identifiers'
 
 const BASE_MESSAGE: Message = {
     serviceId: 'serviceId',
-    messageType: MessageType.RPC,
     messageId: '1',
     body: {
         oneofKind: 'rpcMessage',
@@ -63,13 +62,13 @@ describe('SimultaneousConnections', () => {
 
         const promise1 = new Promise<void>((resolve, _reject) => {
             simTransport1.on('message', async (message: Message) => {
-                expect(message.messageType).toBe(MessageType.RPC)
+                expect(message.body.oneofKind).toBe('rpcMessage')
                 resolve()
             })
         })
         const promise2 = new Promise<void>((resolve, _reject) => {
             simTransport2.on('message', async (message: Message) => {
-                expect(message.messageType).toBe(MessageType.RPC)
+                expect(message.body.oneofKind).toBe('rpcMessage')
                 resolve()
             })
         })
@@ -142,13 +141,13 @@ describe('SimultaneousConnections', () => {
 
             const promise1 = new Promise<void>((resolve, _reject) => {
                 connectionManager1.on('message', async (message: Message) => {
-                    expect(message.messageType).toBe(MessageType.RPC)
+                    expect(message.body.oneofKind).toBe('rpcMessage')
                     resolve()
                 })
             })
             const promise2 = new Promise<void>((resolve, _reject) => {
                 connectionManager2.on('message', async (message: Message) => {
-                    expect(message.messageType).toBe(MessageType.RPC)
+                    expect(message.body.oneofKind).toBe('rpcMessage')
                     resolve()
                 })
             })
@@ -222,13 +221,13 @@ describe('SimultaneousConnections', () => {
 
             const promise1 = new Promise<void>((resolve, _reject) => {
                 connectionManager1.on('message', async (message: Message) => {
-                    expect(message.messageType).toBe(MessageType.RPC)
+                    expect(message.body.oneofKind).toBe('rpcMessage')
                     resolve()
                 })
             })
             const promise2 = new Promise<void>((resolve, _reject) => {
                 connectionManager2.on('message', async (message: Message) => {
-                    expect(message.messageType).toBe(MessageType.RPC)
+                    expect(message.body.oneofKind).toBe('rpcMessage')
                     resolve()
                 })
             })
@@ -290,13 +289,13 @@ describe('SimultaneousConnections', () => {
 
             const promise1 = new Promise<void>((resolve, _reject) => {
                 connectionManager1.on('message', async (message: Message) => {
-                    expect(message.messageType).toBe(MessageType.RPC)
+                    expect(message.body.oneofKind).toBe('rpcMessage')
                     resolve()
                 })
             })
             const promise2 = new Promise<void>((resolve, _reject) => {
                 connectionManager2.on('message', async (message: Message) => {
-                    expect(message.messageType).toBe(MessageType.RPC)
+                    expect(message.body.oneofKind).toBe('rpcMessage')
                     resolve()
                 })
             })

package/test/integration/Store.test.ts

@@ -3,7 +3,7 @@ import { DhtNode } from '../../src/dht/DhtNode'
 import { getDhtAddressFromRaw, getNodeIdFromPeerDescriptor } from '../../src/identifiers'
 import { PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createMockDataEntry, expectEqualData } from '../utils/mock/mockDataEntry'
-import { createMockConnectionDhtNode, createMockPeerDescriptor, waitConnectionManagersReadyForTesting } from '../utils/utils'
+import { createMockConnectionDhtNode, createMockPeerDescriptor, waitForStableTopology } from '../utils/utils'
 
 const NUM_NODES = 100
 const MAX_CONNECTIONS = 20
@@ -33,7 +33,7 @@ describe('Storing data in DHT', () => {
             nodes.push(node)
         }
         await Promise.all(nodes.map((node) => node.joinDht([entrypointDescriptor])))
-        await waitConnectionManagersReadyForTesting(nodes.map((node) => node.connectionManager!), MAX_CONNECTIONS)
+        await waitForStableTopology(nodes, MAX_CONNECTIONS)
     }, 90000)
 
     afterEach(async () => {
@@ -59,7 +59,7 @@ describe('Storing data in DHT', () => {
         )
         expect(successfulStorers.length).toBeGreaterThan(4)
         const fetchingNode = getRandomNode()
-        const results = await fetchingNode.getDataFromDht(getDhtAddressFromRaw(entry.key))
+        const results = await fetchingNode.fetchDataFromDht(getDhtAddressFromRaw(entry.key))
         results.forEach((result) => {
             expectEqualData(result, entry)
         })
@@ -76,7 +76,7 @@ describe('Storing data in DHT', () => {
         )
         expect(successfulStorers.length).toBeGreaterThan(4)
         const fetchingNode = getRandomNode()
-        const results = await fetchingNode.getDataFromDht(getDhtAddressFromRaw(entry.key))
+        const results = await fetchingNode.fetchDataFromDht(getDhtAddressFromRaw(entry.key))
         results.forEach((result) => {
             expectEqualData(result, entry)
             expect(getDhtAddressFromRaw(result.creator)).toEqual(getNodeIdFromPeerDescriptor(requestor))

package/test/integration/StoreAndDelete.test.ts

@@ -1,6 +1,6 @@
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
-import { createMockConnectionDhtNode, waitConnectionManagersReadyForTesting } from '../utils/utils'
+import { createMockConnectionDhtNode, waitForStableTopology } from '../utils/utils'
 import { createMockDataEntry, expectEqualData } from '../utils/mock/mockDataEntry'
 import { createRandomDhtAddress } from '../../src/identifiers'
 import { getDhtAddressFromRaw } from '../../src/identifiers'
@@ -30,7 +30,7 @@ describe('Storing data in DHT', () => {
             nodes.push(node)
         }
         await Promise.all(nodes.map((node) => node.joinDht([entryPoint.getLocalPeerDescriptor()])))
-        await waitConnectionManagersReadyForTesting(nodes.map((node) => node.connectionManager!), MAX_CONNECTIONS)
+        await waitForStableTopology(nodes, MAX_CONNECTIONS)
     }, 90000)
 
     afterEach(async () => {
@@ -46,7 +46,7 @@ describe('Storing data in DHT', () => {
         // Wait for the delete operation to propagate
         await wait(500)
         const fetchingNode = getRandomNode()
-        const results = await fetchingNode.getDataFromDht(getDhtAddressFromRaw(entry.key))
+        const results = await fetchingNode.fetchDataFromDht(getDhtAddressFromRaw(entry.key))
         results.forEach((result) => {
             expect(result.deleted).toBeTrue()
             expectEqualData(result, entry)
@@ -62,14 +62,14 @@ describe('Storing data in DHT', () => {
         // Wait for the delete operation to propagate
         await wait(500)
         const fetchingNode = getRandomNode()
-        const results1 = await fetchingNode.getDataFromDht(getDhtAddressFromRaw(entry.key))
+        const results1 = await fetchingNode.fetchDataFromDht(getDhtAddressFromRaw(entry.key))
         results1.forEach((result) => {
             expect(result.deleted).toBeTrue()
             expectEqualData(result, entry)
         })
         const successfulStorers2 = await storingNode.storeDataToDht(getDhtAddressFromRaw(entry.key), entry.data!)
         expect(successfulStorers2.length).toBeGreaterThan(4)
-        const results2 = await fetchingNode.getDataFromDht(getDhtAddressFromRaw(entry.key))
+        const results2 = await fetchingNode.fetchDataFromDht(getDhtAddressFromRaw(entry.key))
         results2.forEach((result) => {
             expect(result.deleted).toBeFalse()
             expectEqualData(result, entry)

package/test/integration/StoreOnDhtWithThreeNodes.test.ts

@@ -41,15 +41,15 @@ describe('Storing data in DHT with two peers', () => {
         const storedData1 = createMockDataEntry()
         const storedData2 = createMockDataEntry()
         // Here we effectively test that fetching "null" data doesn't take too long. A test timeout here indicates an issue. 
-        await node1.getDataFromDht(getDhtAddressFromRaw(storedData1.key))
-        await node2.getDataFromDht(getDhtAddressFromRaw(storedData1.key))
+        await node1.fetchDataFromDht(getDhtAddressFromRaw(storedData1.key))
+        await node2.fetchDataFromDht(getDhtAddressFromRaw(storedData1.key))
         
         await node1.storeDataToDht(getDhtAddressFromRaw(storedData1.key), storedData1.data!)
         await node2.storeDataToDht(getDhtAddressFromRaw(storedData1.key), storedData1.data!)
         await entryPoint.storeDataToDht(getDhtAddressFromRaw(storedData2.key), storedData2.data!)
-        const foundData1 = await node1.getDataFromDht(getDhtAddressFromRaw(storedData1.key))
-        const foundData2 = await node2.getDataFromDht(getDhtAddressFromRaw(storedData1.key))
-        const foundData3 = await entryPoint.getDataFromDht(getDhtAddressFromRaw(storedData2.key))
+        const foundData1 = await node1.fetchDataFromDht(getDhtAddressFromRaw(storedData1.key))
+        const foundData2 = await node2.fetchDataFromDht(getDhtAddressFromRaw(storedData1.key))
+        const foundData3 = await entryPoint.fetchDataFromDht(getDhtAddressFromRaw(storedData2.key))
         expectEqualData(foundData1[0], storedData1)
         expectEqualData(foundData1[1], storedData1)
         expectEqualData(foundData2[0], storedData1)

package/test/integration/StoreOnDhtWithTwoNodes.test.ts

@@ -34,8 +34,8 @@ describe('Storing data in DHT with two peers', () => {
         const storedData2 = createMockDataEntry()
         await otherNode.storeDataToDht(getDhtAddressFromRaw(storedData1.key), storedData1.data!)
         await entryPoint.storeDataToDht(getDhtAddressFromRaw(storedData2.key), storedData2.data!)
-        const foundData1 = await otherNode.getDataFromDht(getDhtAddressFromRaw(storedData1.key))
-        const foundData2 = await entryPoint.getDataFromDht(getDhtAddressFromRaw(storedData2.key))
+        const foundData1 = await otherNode.fetchDataFromDht(getDhtAddressFromRaw(storedData1.key))
+        const foundData2 = await entryPoint.fetchDataFromDht(getDhtAddressFromRaw(storedData2.key))
         expectEqualData(foundData1[0], storedData1)
         expectEqualData(foundData2[0], storedData2)
     })
@@ -45,7 +45,7 @@ describe('Storing data in DHT with two peers', () => {
         await waitForCondition(() => entryPoint.getNeighborCount() === 0)
         const storedData = createMockDataEntry()
         await entryPoint.storeDataToDht(getDhtAddressFromRaw(storedData.key), storedData.data!)
-        const foundData = await entryPoint.getDataFromDht(getDhtAddressFromRaw(storedData.key))
+        const foundData = await entryPoint.fetchDataFromDht(getDhtAddressFromRaw(storedData.key))
         expectEqualData(foundData[0], storedData)
     }, 60000)
 })

package/test/integration/WebrtcConnectionManagement.test.ts

@@ -1,6 +1,6 @@
 import { ConnectionManager } from '../../src/connection/ConnectionManager'
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
-import { Message, MessageType, NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { Message, NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
 import { ConnectionType } from '../../src/connection/IConnection'
 import { ITransport } from '../../src/transport/ITransport'
@@ -63,7 +63,6 @@ describe('WebRTC Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             },
-            messageType: MessageType.RPC,
             messageId: 'mockerer'
         }
 
@@ -87,7 +86,6 @@ describe('WebRTC Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             }, 
-            messageType: MessageType.RPC,
             messageId: 'mockerer'
         }
         manager1.on('message', (message: Message) => {
@@ -108,7 +106,6 @@ describe('WebRTC Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             },
-            messageType: MessageType.RPC,
             messageId: 'mockerer'
         }
         dummyMessage.targetDescriptor = peerDescriptor1
@@ -120,7 +117,6 @@ describe('WebRTC Connection Management', () => {
     it('Connects and disconnects webrtc connections', async () => {
         const msg: Message = {
             serviceId,
-            messageType: MessageType.RPC,
             messageId: '1',
             body: {
                 oneofKind: 'rpcMessage',
@@ -130,14 +126,14 @@ describe('WebRTC Connection Management', () => {
 
         const dataPromise = new Promise<void>((resolve, _reject) => {
             manager2.on('message', async (message: Message) => {
-                expect(message.messageType).toBe(MessageType.RPC)
+                expect(message.body.oneofKind).toBe('rpcMessage')
                 resolve()
             })
         })
 
         const connectedPromise1 = new Promise<void>((resolve, _reject) => {
             manager1.on('connected', () => {
-                //expect(message.messageType).toBe(MessageType.RPC)
+                //expect(message.body.oneofKind).toBe('rpcMessage')
                 resolve()
             })
         })
@@ -175,7 +171,6 @@ describe('WebRTC Connection Management', () => {
     it('Disconnects webrtcconnection while being connected', async () => {
         const msg: Message = {
             serviceId,
-            messageType: MessageType.RPC,
             messageId: '1',
             body: {
                 oneofKind: 'rpcMessage',
@@ -204,7 +199,6 @@ describe('WebRTC Connection Management', () => {
     it('failed connections are cleaned up', async () => {
         const msg: Message = {
             serviceId,
-            messageType: MessageType.RPC,
             messageId: '1',
             body: {
                 oneofKind: 'rpcMessage',

package/test/integration/Websocket.test.ts

@@ -2,7 +2,7 @@
 
 import { WebsocketServer } from '../../src/connection/websocket/WebsocketServer'
 import { IConnection } from '../../src/connection/IConnection'
-import { ClientWebsocket } from '../../src/connection/websocket/ClientWebsocket'
+import { WebsocketClientConnection } from '../../src/connection/websocket/NodeWebsocketClientConnection'
 import { Logger } from '@streamr/utils'
 
 const logger = new Logger(module)
@@ -13,7 +13,7 @@ describe('Websocket', () => {
         portRange: { min: 9977, max: 9977 },
         enableTls: false
     })
-    const clientWebsocket = new ClientWebsocket()
+    const clientWebsocket = new WebsocketClientConnection()
 
     beforeAll(async () => {
         await websocketServer.start()

package/test/integration/WebsocketConnectionManagement.test.ts

@@ -7,7 +7,7 @@ import { ConnectionType } from '../../src/connection/IConnection'
 import { Simulator } from '../../src/connection/simulator/Simulator'
 import { SimulatorTransport } from '../../src/connection/simulator/SimulatorTransport'
 import * as Err from '../../src/helpers/errors'
-import { Message, MessageType, NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { Message, NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
 import { TransportEvents } from '../../src/transport/ITransport'
 import { getNodeIdFromPeerDescriptor } from '../../src/identifiers'
@@ -98,7 +98,6 @@ describe('Websocket Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             },
-            messageType: MessageType.RPC,
             messageId: 'mockerer',
             targetDescriptor: noWsServerConnectorPeerDescriptor
         }
@@ -124,7 +123,6 @@ describe('Websocket Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             },
-            messageType: MessageType.RPC,
             messageId: 'mockerer',
             targetDescriptor: biggerNoWsServerConnectorPeerDescriptor
         }
@@ -150,7 +148,6 @@ describe('Websocket Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             },
-            messageType: MessageType.RPC,
             messageId: 'mockerer',
             targetDescriptor: {
                 nodeId: new Uint8Array([1, 2, 4]),
@@ -172,7 +169,6 @@ describe('Websocket Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             },
-            messageType: MessageType.RPC,
             messageId: 'mockerer',
             targetDescriptor: wsServerConnectorPeerDescriptor
         }
@@ -199,7 +195,6 @@ describe('Websocket Connection Management', () => {
                 oneofKind: 'rpcMessage',
                 rpcMessage: RpcMessage.create()
             },
-            messageType: MessageType.RPC,
             messageId: 'mockerer',
             targetDescriptor: noWsServerConnectorPeerDescriptor
         }

package/test/integration/rpc-connections-over-webrpc.test.ts

@@ -133,14 +133,13 @@ describe('RPC connections over WebRTC', () => {
 
         const msg: Message = {
             serviceId,
-            messageType: MessageType.RPC,
             messageId: '1',
             body: RpcMessage.toBinary(rpcMessage)
         }
 
         const disconnectedPromise1 = new Promise<void>((resolve, _reject) => {
             manager1.on('disconnected', () => {
-                //expect(message.messageType).toBe(MessageType.RPC)
+                //expect(message.body.oneofKind).toBe('rpcMessage')
                 resolve()
             })
         })

package/test/unit/PeerManager.test.ts

@@ -1,24 +1,35 @@
 import { PeerManager, getDistance } from '../../src/dht/PeerManager'
-import { DhtAddress, createRandomDhtAddress, getRawFromDhtAddress } from '../../src/identifiers'
+import { DhtAddress, createRandomDhtAddress, getNodeIdFromPeerDescriptor, getRawFromDhtAddress } from '../../src/identifiers'
 import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { range, sampleSize, sortBy, without } from 'lodash'
+import { range, sample, sampleSize, sortBy, without } from 'lodash'
 import { DhtNodeRpcRemote } from '../../src/dht/DhtNodeRpcRemote'
 import { MockRpcCommunicator } from '../utils/mock/MockRpcCommunicator'
+import { createMockPeerDescriptor } from '../utils/utils'
+
+const createPeerManager = (nodeIds: DhtAddress[]) => {
+    const peerDescriptor = createMockPeerDescriptor()
+    const manager = new PeerManager({
+        localNodeId: getNodeIdFromPeerDescriptor(peerDescriptor),
+        localPeerDescriptor: peerDescriptor,
+        createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => {
+            return new DhtNodeRpcRemote(undefined as any, peerDescriptor, undefined as any, new MockRpcCommunicator())
+        }
+    } as any)
+    const contacts = nodeIds.map((n) => ({ nodeId: getRawFromDhtAddress(n), type: NodeType.NODEJS }))
+    for (const contact of contacts) {
+        manager.addContact(contact)
+    }
+    return manager
+}
 
 describe('PeerManager', () => {
 
     it('getClosestContactsTo', () => {
         const nodeIds = range(10).map(() => createRandomDhtAddress())
-        const manager = new PeerManager({
-            localNodeId: createRandomDhtAddress(),
-            createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => {
-                return new DhtNodeRpcRemote(undefined as any, peerDescriptor, undefined as any, new MockRpcCommunicator())
-            }
-        } as any)
-        manager.addContact(nodeIds.map((n) => ({ nodeId: getRawFromDhtAddress(n), type: NodeType.NODEJS })))
-
+        const manager = createPeerManager(nodeIds)
         const referenceId = createRandomDhtAddress()
         const excluded = new Set<DhtAddress>(sampleSize(nodeIds, 2))
+
         const actual = manager.getClosestContactsTo(referenceId, 5, excluded)
 
         const expected = sortBy(
@@ -27,4 +38,27 @@ describe('PeerManager', () => {
         ).slice(0, 5)
         expect(actual.map((n) => n.getNodeId())).toEqual(expected)
     })
+
+    it('getClosestNeighborsTo', () => {
+        const nodeIds = range(10).map(() => createRandomDhtAddress())
+        const manager = createPeerManager(nodeIds)
+        const referenceId = createRandomDhtAddress()
+        const excluded = new Set<DhtAddress>(sampleSize(nodeIds, 2))
+
+        const actual = manager.getClosestNeighborsTo(referenceId, 5, excluded)
+
+        const expected = sortBy(
+            without(manager.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n)), ...Array.from(excluded.values())),
+            (n: DhtAddress) => getDistance(getRawFromDhtAddress(n), getRawFromDhtAddress(referenceId))
+        ).slice(0, 5)
+        expect(actual.map((n) => n.getNodeId())).toEqual(expected)
+    })
+
+    it('getContactCount', () => {
+        const nodeIds = range(10).map(() => createRandomDhtAddress())
+        const manager = createPeerManager(nodeIds)
+        expect(manager.getContactCount()).toBe(10)
+        expect(manager.getContactCount(new Set(sampleSize(nodeIds, 2)))).toBe(8)
+        expect(manager.getContactCount(new Set([sample(nodeIds)!, createRandomDhtAddress()]))).toBe(9)
+    })
 })

package/test/unit/RecursiveOperationManager.test.ts

@@ -1,14 +1,13 @@
 import {
     RecursiveOperation,
     Message,
-    MessageType,
     RouteMessageAck,
     RouteMessageError,
-    RouteMessageWrapper
+    RouteMessageWrapper,
+    RecursiveOperationRequest
 } from '../../src/proto/packages/dht/protos/DhtRpc'
 import {
     createWrappedClosestPeersRequest,
-    createFindRequest,
     createMockPeerDescriptor
 } from '../utils/utils'
 import { RecursiveOperationManager } from '../../src/dht/recursive-operation/RecursiveOperationManager'
@@ -33,15 +32,23 @@ const createMockRouter = (error?: RouteMessageError): Partial<Router> => {
         addToDuplicateDetector: () => {}
     }
 }
+
+const createRequest = (): RecursiveOperationRequest => {
+    const request: RecursiveOperationRequest = {
+        operation: RecursiveOperation.FIND_CLOSEST_NODES,
+        sessionId: v4()
+    }
+    return request
+}
+
 describe('RecursiveOperationManager', () => {
 
     const peerDescriptor1 = createMockPeerDescriptor()
     const peerDescriptor2 = createMockPeerDescriptor()
-    const recursiveOperationRequest = createFindRequest()
+    const recursiveOperationRequest = createRequest()
     const message: Message = {
         serviceId: 'unknown',
         messageId: v4(),
-        messageType: MessageType.RPC,
         body: {
             oneofKind: 'recursiveOperationRequest',
             recursiveOperationRequest
@@ -83,9 +90,9 @@ describe('RecursiveOperationManager', () => {
         recursiveOperationManager.stop()
     })
 
-    it('startFind with mode Node returns self if no peers', async () => {
+    it('find closest nodes returns self if no peers', async () => {
         const recursiveOperationManager = createRecursiveOperationManager()
-        const res = await recursiveOperationManager.execute(createRandomDhtAddress(), RecursiveOperation.FIND_NODE)
+        const res = await recursiveOperationManager.execute(createRandomDhtAddress(), RecursiveOperation.FIND_CLOSEST_NODES)
         expect(areEqualPeerDescriptors(res.closestNodes[0], peerDescriptor1)).toEqual(true)
         recursiveOperationManager.stop()
     })
@@ -96,7 +103,6 @@ describe('RecursiveOperationManager', () => {
         const badMessage: Message = {
             serviceId: 'unknown',
             messageId: v4(),
-            messageType: MessageType.RPC,
             body: {
                 oneofKind: 'rpcMessage',
                 rpcMessage: rpcWrapper

package/test/unit/RecursiveOperationSession.test.ts

@@ -39,7 +39,7 @@ describe('RecursiveOperationSession', () => {
             targetId: createRandomDhtAddress(),
             localPeerDescriptor,
             waitedRoutingPathCompletions: 3,
-            operation: RecursiveOperation.FIND_NODE,
+            operation: RecursiveOperation.FIND_CLOSEST_NODES,
             doRouteRequest
         })
         const onCompleted = jest.fn()

package/test/unit/Router.test.ts

@@ -3,7 +3,6 @@ import { DhtNodeRpcRemote } from '../../src/dht/DhtNodeRpcRemote'
 import { Router } from '../../src/dht/routing/Router'
 import { 
     Message,
-    MessageType,
     PeerDescriptor,
     RouteMessageAck,
     RouteMessageError,
@@ -23,7 +22,6 @@ describe('Router', () => {
     const message: Message = {
         serviceId: 'unknown',
         messageId: v4(),
-        messageType: MessageType.RPC,
         body: {
             oneofKind: 'rpcMessage',
             rpcMessage: rpcWrapper
@@ -52,7 +50,6 @@ describe('Router', () => {
         router = new Router({
             localPeerDescriptor: peerDescriptor1,
             rpcCommunicator: rpcCommunicator as any,
-            addContact: (_contact) => {},
             connections,
             handleMessage: () => {}
         })

package/test/unit/RoutingSession.test.ts

@@ -1,6 +1,6 @@
 import { v4 } from 'uuid'
 import { RoutingMode, RoutingSession } from '../../src/dht/routing/RoutingSession'
-import { Message, MessageType, PeerDescriptor, RouteMessageWrapper } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { Message, PeerDescriptor, RouteMessageWrapper } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createMockPeerDescriptor, createWrappedClosestPeersRequest } from '../utils/utils'
 import { DhtNodeRpcRemote } from '../../src/dht/DhtNodeRpcRemote'
 import { RoutingRpcCommunicator } from '../../src/transport/RoutingRpcCommunicator'
@@ -20,7 +20,6 @@ describe('RoutingSession', () => {
     const message: Message = {
         serviceId: 'unknown',
         messageId: v4(),
-        messageType: MessageType.RPC,
         body: {
             oneofKind: 'rpcMessage',
             rpcMessage: rpcWrapper

package/test/unit/connectivityRequestHandler.test.ts

@@ -5,8 +5,8 @@ import { Server as HttpServer, createServer as createHttpServer } from 'http'
 import { server as WsServer } from 'websocket'
 import { CONNECTIVITY_CHECKER_SERVICE_ID } from '../../src/connection/connectivityChecker'
 import { attachConnectivityRequestHandler } from '../../src/connection/connectivityRequestHandler'
-import { Message, MessageType } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { version } from '../../package.json'
+import { Message } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { LOCAL_PROTOCOL_VERSION } from '../../src/helpers/version'
 
 const HOST = '127.0.0.1'
 const PORT = 15001
@@ -27,7 +27,7 @@ describe('connectivityRequestHandler', () => {
         await once(httpServer, 'listening')
         connection = new EventEmitter()
         connection.send = jest.fn()
-        connection.getRemoteIp = () => HOST
+        connection.remoteIpAddress = HOST
     })
 
     afterEach(async () => {
@@ -40,7 +40,6 @@ describe('connectivityRequestHandler', () => {
         attachConnectivityRequestHandler(connection)
         const request: Message = {
             serviceId: CONNECTIVITY_CHECKER_SERVICE_ID,
-            messageType: MessageType.CONNECTIVITY_REQUEST,
             messageId: 'mock-message-id',
             body: {
                 oneofKind: 'connectivityRequest',
@@ -63,12 +62,11 @@ describe('connectivityRequestHandler', () => {
                         tls: false
                     },
                     ipAddress: ipv4ToNumber(HOST),
-                    version
+                    version: LOCAL_PROTOCOL_VERSION
                 },
                 oneofKind: 'connectivityResponse'
             },
             messageId: expect.any(String),
-            messageType: MessageType.CONNECTIVITY_RESPONSE,
             serviceId: 'system/connectivity-checker'
         })
     })
@@ -77,7 +75,6 @@ describe('connectivityRequestHandler', () => {
         attachConnectivityRequestHandler(connection)
         const request: Message = {
             serviceId: CONNECTIVITY_CHECKER_SERVICE_ID,
-            messageType: MessageType.CONNECTIVITY_REQUEST,
             messageId: 'mock-message-id',
             body: {
                 oneofKind: 'connectivityRequest',
@@ -95,12 +92,11 @@ describe('connectivityRequestHandler', () => {
                     host: HOST,
                     natType: 'unknown',
                     ipAddress: ipv4ToNumber(HOST),
-                    version
+                    version: LOCAL_PROTOCOL_VERSION
                 },
                 oneofKind: 'connectivityResponse'
             },
             messageId: expect.any(String),
-            messageType: MessageType.CONNECTIVITY_RESPONSE,
             serviceId: 'system/connectivity-checker'
         })
     })