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

package/test/integration/StoreAndDelete.test.ts

@@ -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/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,16 +1,19 @@
 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 { DhtNodeRpcRemote } from '../../src/dht/DhtNodeRpcRemote'
 import { MockRpcCommunicator } from '../utils/mock/MockRpcCommunicator'
+import { createMockPeerDescriptor } from '../utils/utils'
 
 describe('PeerManager', () => {
 
     it('getClosestContactsTo', () => {
         const nodeIds = range(10).map(() => createRandomDhtAddress())
+        const peerDescriptor = createMockPeerDescriptor()
         const manager = new PeerManager({
-            localNodeId: createRandomDhtAddress(),
+            localNodeId: getNodeIdFromPeerDescriptor(peerDescriptor),
+            localPeerDescriptor: peerDescriptor,
             createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => {
                 return new DhtNodeRpcRemote(undefined as any, peerDescriptor, undefined as any, new MockRpcCommunicator())
             }

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

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'
         })
     })

package/test/unit/createPeerDescriptor.test.ts

@@ -3,22 +3,26 @@ import { createPeerDescriptor } from '../../src/helpers/createPeerDescriptor'
 import { isBrowserEnvironment } from '../../src/helpers/browser/isBrowserEnvironment'
 import { NodeType } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { createRandomDhtAddress, getRawFromDhtAddress } from '../../src/identifiers'
+import { getRandomRegion } from '../../dist/src/connection/simulator/pings'
 
 const IP_ADDRESS = '1.2.3.4'
 
 describe('createPeerDescriptor', () => {
 
+    const region = getRandomRegion()
+
     it('without websocket', () => {
         const connectivityResponse = {
             ipAddress: ipv4ToNumber(IP_ADDRESS)
         } as any
-        const peerDescriptor = createPeerDescriptor(connectivityResponse)
+        const peerDescriptor = createPeerDescriptor(connectivityResponse, region)
         expect(peerDescriptor).toEqual({
             nodeId: expect.any(Uint8Array),
             type: isBrowserEnvironment() ? NodeType.BROWSER : NodeType.NODEJS,
             ipAddress: ipv4ToNumber(IP_ADDRESS),
             publicKey: expect.any(Uint8Array),
-            signature: expect.any(Uint8Array)
+            signature: expect.any(Uint8Array),
+            region
         })
     })
 
@@ -31,7 +35,7 @@ describe('createPeerDescriptor', () => {
                 tls: true
             }
         } as any
-        const peerDescriptor = createPeerDescriptor(connectivityResponse)
+        const peerDescriptor = createPeerDescriptor(connectivityResponse, region)
         expect(peerDescriptor).toEqual({
             nodeId: expect.any(Uint8Array),
             type: isBrowserEnvironment() ? NodeType.BROWSER : NodeType.NODEJS,
@@ -42,7 +46,8 @@ describe('createPeerDescriptor', () => {
                 host: 'bar.com',
                 port: 123,
                 tls: true
-            }
+            },
+            region
         })
     })
 
@@ -51,13 +56,14 @@ describe('createPeerDescriptor', () => {
         const connectivityResponse = {
             ipAddress: ipv4ToNumber(IP_ADDRESS)
         } as any
-        const peerDescriptor = createPeerDescriptor(connectivityResponse, nodeId)
+        const peerDescriptor = createPeerDescriptor(connectivityResponse, region, nodeId)
         expect(peerDescriptor).toEqual({
             nodeId: getRawFromDhtAddress(nodeId),
             type: isBrowserEnvironment() ? NodeType.BROWSER : NodeType.NODEJS,
             ipAddress: ipv4ToNumber(IP_ADDRESS),
             publicKey: expect.any(Uint8Array),
-            signature: expect.any(Uint8Array)
+            signature: expect.any(Uint8Array),
+            region
         })
     })
 })

package/test/unit/version.test.ts

@@ -0,0 +1,18 @@
+import { isMaybeSupportedVersion } from '../../src/helpers/version'
+
+describe('version', () => {
+
+    it('supported', () => {
+        expect(isMaybeSupportedVersion('1.0')).toBe(true)
+        expect(isMaybeSupportedVersion('1.1')).toBe(true)
+        expect(isMaybeSupportedVersion('2.0')).toBe(true)
+        expect(isMaybeSupportedVersion('3.5')).toBe(true)
+    })
+
+    it('not supported', () => {
+        expect(isMaybeSupportedVersion('')).toBe(false)
+        expect(isMaybeSupportedVersion('100.0.0-testnet-three.3')).toBe(false)
+        expect(isMaybeSupportedVersion('0.0')).toBe(false)
+        expect(isMaybeSupportedVersion('0.1')).toBe(false)
+    })
+})

package/test/utils/utils.ts

@@ -10,8 +10,7 @@ import {
     RouteMessageWrapper,
     StoreDataRequest,
     StoreDataResponse,
-    RecursiveOperationRequest, 
-    RecursiveOperation
+    ClosestRingPeersResponse
 } from '../../src/proto/packages/dht/protos/DhtRpc'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
 import {
@@ -38,6 +37,40 @@ export const createMockPeerDescriptor = (opts?: Partial<Omit<PeerDescriptor, 'no
     }
 }
 
+export const createMockRingNode = async (
+    simulator: Simulator,
+    nodeId: DhtAddress,
+    region: number
+): Promise<DhtNode> => {
+    const maxConnections = 80
+    const dhtJoinTimeout = 45000
+
+    const peerDescriptor: PeerDescriptor = {
+        nodeId: getRawFromDhtAddress(nodeId ?? createRandomDhtAddress()),
+        type: NodeType.NODEJS,
+        region
+        //ipAddress: ipv4ToNumber(ipAddress)
+    }
+    const mockConnectionManager = new SimulatorTransport(peerDescriptor, simulator)
+    await mockConnectionManager.start()
+    const opts = {
+        peerDescriptor: peerDescriptor,
+        transport: mockConnectionManager,
+        numberOfNodesPerKBucket: 8,
+        maxConnections: maxConnections,
+        dhtJoinTimeout,
+        rpcRequestTimeout: 5000
+    }
+    const node = new class extends DhtNode {
+        async stop(): Promise<void> {
+            await super.stop()
+            await mockConnectionManager.stop()
+        }
+    }(opts)
+    await node.start()
+    return node
+}
+
 export const createMockConnectionDhtNode = async (
     simulator: Simulator,
     nodeId?: DhtAddress,
@@ -107,14 +140,6 @@ export const createWrappedClosestPeersRequest = (
     return rpcWrapper
 }
 
-export const createFindRequest = (): RecursiveOperationRequest => {
-    const request: RecursiveOperationRequest = {
-        operation: RecursiveOperation.FIND_NODE,
-        sessionId: v4()
-    }
-    return request
-}
-
 interface IDhtRpcWithError extends IDhtNodeRpc {
     throwPingError: (request: PingRequest) => Promise<PingResponse>
     respondPingWithTimeout: (request: PingRequest) => Promise<PingResponse>
@@ -130,6 +155,14 @@ export const createMockDhtRpc = (neighbors: PeerDescriptor[]): IDhtRpcWithError
             }
             return response
         },
+        async getClosestRingPeers(): Promise<ClosestRingPeersResponse> {
+            const response: ClosestRingPeersResponse = {
+                leftPeers: neighbors,
+                rightPeers: neighbors,
+                requestId: 'why am i still here'
+            }
+            return response
+        },
         async ping(request: PingRequest): Promise<PingResponse> {
             const response: PingResponse = {
                 requestId: request.requestId

package/tsconfig.jest.json

@@ -16,6 +16,7 @@
         { "path": "../utils/tsconfig.node.json" },
         { "path": "../test-utils/tsconfig.node.json" },
         { "path": "../proto-rpc/tsconfig.node.json" },
-        { "path": "../autocertifier-client/tsconfig.node.json" }
+        { "path": "../autocertifier-client/tsconfig.node.json" },
+        { "path": "../cdn-location/tsconfig.node.json" }
     ]
 }

package/tsconfig.node.json

@@ -15,6 +15,7 @@
         { "path": "../utils/tsconfig.node.json" },
         { "path": "../test-utils/tsconfig.node.json" },
         { "path": "../proto-rpc/tsconfig.node.json" },
-        { "path": "../autocertifier-client/tsconfig.node.json" }
+        { "path": "../autocertifier-client/tsconfig.node.json" },
+        { "path": "../cdn-location/tsconfig.node.json" }
     ]
 }

package/dist/src/connection/websocket/ServerWebsocket.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServerWebsocket.js","sourceRoot":"","sources":["../../../../src/connection/websocket/ServerWebsocket.ts"],"names":[],"mappings":"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"}

package/dist/src/helpers/versionCompatibility.d.ts

@@ -1,2 +0,0 @@
-export declare const isCompatibleVersion: (version1: string, version2: string) => boolean;
-export declare const excludePatchVersion: (version: string) => string;

package/dist/src/helpers/versionCompatibility.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.excludePatchVersion = exports.isCompatibleVersion = void 0;
-// Is able to compare versions such as 1.2.3 and 1.2.4
-// can also compare versions such as 100.0.0-pretestnet.0 and 100.0.0-pretestnet.40
-const isCompatibleVersion = (version1, version2) => {
-    const minorVersion1 = (0, exports.excludePatchVersion)(version1);
-    const minorVersion2 = (0, exports.excludePatchVersion)(version2);
-    return minorVersion1 === minorVersion2;
-};
-exports.isCompatibleVersion = isCompatibleVersion;
-const excludePatchVersion = (version) => {
-    const versionParts = version.split('.');
-    versionParts.pop();
-    return versionParts.join('.');
-};
-exports.excludePatchVersion = excludePatchVersion;
-//# sourceMappingURL=versionCompatibility.js.map

package/dist/src/helpers/versionCompatibility.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"versionCompatibility.js","sourceRoot":"","sources":["../../../src/helpers/versionCompatibility.ts"],"names":[],"mappings":";;;AAAA,sDAAsD;AACtD,mFAAmF;AAC5E,MAAM,mBAAmB,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAW,EAAE;IAC/E,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,CAAA;IACnD,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,CAAA;IACnD,OAAO,aAAa,KAAK,aAAa,CAAA;AAC1C,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAU,EAAE;IAC3D,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACvC,YAAY,CAAC,GAAG,EAAE,CAAA;IAClB,OAAO,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B"}

package/src/helpers/versionCompatibility.ts

@@ -1,13 +0,0 @@
-// Is able to compare versions such as 1.2.3 and 1.2.4
-// can also compare versions such as 100.0.0-pretestnet.0 and 100.0.0-pretestnet.40
-export const isCompatibleVersion = (version1: string, version2: string): boolean => {
-    const minorVersion1 = excludePatchVersion(version1)
-    const minorVersion2 = excludePatchVersion(version2)
-    return minorVersion1 === minorVersion2
-}
-
-export const excludePatchVersion = (version: string): string => {
-    const versionParts = version.split('.')
-    versionParts.pop()
-    return versionParts.join('.')
-}