@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-testnet-one.1

package/test/integration/DhtNodeRpcRemote.test.ts

@@ -20,11 +20,11 @@ describe('DhtNodeRpcRemote', () => {
     let serverRpcCommunicator: RpcCommunicator
     const serviceId = 'test'
     const clientPeerDescriptor: PeerDescriptor = {
-        kademliaId: generateId('client'),
+        nodeId: generateId('client'),
         type: NodeType.NODEJS
     }
     const serverPeerDescriptor: PeerDescriptor = {
-        kademliaId: generateId('server'),
+        nodeId: generateId('server'),
         type: NodeType.NODEJS
     }
 
@@ -54,7 +54,7 @@ describe('DhtNodeRpcRemote', () => {
     })
 
     it('getClosestPeers happy path', async () => {
-        const neighbors = await rpcRemote.getClosestPeers(clientPeerDescriptor.kademliaId)
+        const neighbors = await rpcRemote.getClosestPeers(clientPeerDescriptor.nodeId)
         expect(neighbors.length).toEqual(getMockPeers().length)
     })
 
@@ -66,7 +66,7 @@ describe('DhtNodeRpcRemote', () => {
 
     it('getClosestPeers error path', async () => {
         serverRpcCommunicator.registerRpcMethod(ClosestPeersRequest, ClosestPeersResponse, 'getClosestPeers', MockDhtRpc.throwGetClosestPeersError)
-        await expect(rpcRemote.getClosestPeers(clientPeerDescriptor.kademliaId))
+        await expect(rpcRemote.getClosestPeers(clientPeerDescriptor.nodeId))
             .rejects.toThrow('Closest peers error')
     })
 

package/test/integration/DhtRpc.test.ts

@@ -13,12 +13,12 @@ describe('DhtRpc', () => {
     let client2: ProtoRpcClient<DhtNodeRpcClient>
 
     const peerDescriptor1: PeerDescriptor = {
-        kademliaId: generateId('peer1'),
+        nodeId: generateId('peer1'),
         type: NodeType.NODEJS
     }
 
     const peerDescriptor2: PeerDescriptor = {
-        kademliaId: generateId('peer2'),
+        nodeId: generateId('peer2'),
         type: NodeType.NODEJS
     }
 
@@ -50,7 +50,7 @@ describe('DhtRpc', () => {
 
     it('Happy path', async () => {
         const response1 = client1.getClosestPeers(
-            { kademliaId: peerDescriptor1.kademliaId, requestId: '1' },
+            { nodeId: peerDescriptor1.nodeId, requestId: '1' },
             {
                 sourceDescriptor: peerDescriptor1,
                 targetDescriptor: peerDescriptor2,
@@ -60,7 +60,7 @@ describe('DhtRpc', () => {
         expect(res1.peers).toEqual(getMockPeers())
 
         const response2 = client2.getClosestPeers(
-            { kademliaId: peerDescriptor2.kademliaId, requestId: '1' },
+            { nodeId: peerDescriptor2.nodeId, requestId: '1' },
             {
                 sourceDescriptor: peerDescriptor2,
                 targetDescriptor: peerDescriptor1
@@ -76,7 +76,7 @@ describe('DhtRpc', () => {
             await wait(3000)
         })
         const response2 = client2.getClosestPeers(
-            { kademliaId: peerDescriptor2.kademliaId, requestId: '1' },
+            { nodeId: peerDescriptor2.nodeId, requestId: '1' },
             {
                 sourceDescriptor: peerDescriptor2,
                 targetDescriptor: peerDescriptor1
@@ -102,7 +102,7 @@ describe('DhtRpc', () => {
 
         rpcCommunicator2.registerRpcMethod(ClosestPeersRequest, ClosestPeersResponse, 'getClosestPeers', respondGetClosestPeersWithTimeout)
         const response = client2.getClosestPeers(
-            { kademliaId: peerDescriptor2.kademliaId, requestId: '1' },
+            { nodeId: peerDescriptor2.nodeId, requestId: '1' },
             {
                 sourceDescriptor: peerDescriptor2,
                 targetDescriptor: peerDescriptor1

package/test/integration/Find.test.ts

@@ -38,10 +38,10 @@ describe('Find correctness', () => {
     })
 
     it('Entrypoint can find a node from the network (exact match)', async () => {
-        const kademliaIdToFind = nodes[45].getNodeId().value
-        const results = await entryPoint.startFind(kademliaIdToFind)
+        const nodeIdToFind = nodes[45].getNodeId().value
+        const results = await entryPoint.startFind(nodeIdToFind)
         expect(results.closestNodes.length).toBeGreaterThanOrEqual(5)
-        expect(PeerID.fromValue(kademliaIdToFind).equals(peerIdFromPeerDescriptor(results.closestNodes[0])))
+        expect(PeerID.fromValue(nodeIdToFind).equals(peerIdFromPeerDescriptor(results.closestNodes[0])))
     }, 30000)
 
 })

package/test/integration/Layer1-scale.test.ts

@@ -13,7 +13,7 @@ describe('Layer1', () => {
     const layer0EntryPointId = new UUID().toString()
 
     const entryPoint0Descriptor = {
-        kademliaId: PeerID.fromString(layer0EntryPointId).value,
+        nodeId: PeerID.fromString(layer0EntryPointId).value,
         type: NodeType.NODEJS
     }
 
@@ -75,7 +75,7 @@ describe('Layer1', () => {
             const layer1Node = layer1Nodes[i]
             expect(layer1Node.getNodeId().equals(layer0Node.getNodeId())).toEqual(true)
             expect(layer1Node.getNumberOfConnections()).toEqual(layer0Node.getNumberOfConnections())
-            expect(layer1Node.getBucketSize()).toBeGreaterThanOrEqual(NUM_OF_NODES_PER_KBUCKET / 2)
+            expect(layer1Node.getNumberOfNeighbors()).toBeGreaterThanOrEqual(NUM_OF_NODES_PER_KBUCKET / 2)
             expect(layer1Node.getAllConnectionPeerDescriptors()).toEqual(layer0Node.getAllConnectionPeerDescriptors())
         }
     }, 120000)
@@ -155,7 +155,7 @@ describe('Layer1', () => {
     //             layer1CleanUp.push(layer1)
     //             receivedMessages.set(layer0.getNodeId().toKey(), new Set())
     //             layer1.on('message', (msg: Message) => {
-    //                 const peerId = PeerID.fromValue(msg.sourceDescriptor!.kademliaId)
+    //                 const peerId = PeerID.fromValue(msg.sourceDescriptor!.nodeId)
     //                 receivedMessages.get(layer0.getNodeId().toKey())!.add(peerId.toKey())
     //             })
     //         }

package/test/integration/Mock-Layer1-Layer0.test.ts

@@ -51,7 +51,7 @@ describe('Layer 1 on Layer 0 with mocked connections', () => {
         layer1Node4 = await createMockConnectionLayer1Node(layer0Node4Id, layer0Node4)
 
         entryPointDescriptor = {
-            kademliaId: layer0EntryPoint.getNodeId().value,
+            nodeId: layer0EntryPoint.getNodeId().value,
             type: NodeType.NODEJS
         }
 
@@ -85,21 +85,21 @@ describe('Layer 1 on Layer 0 with mocked connections', () => {
         await layer1Node3.joinDht([entryPointDescriptor])
         await layer1Node4.joinDht([entryPointDescriptor])
 
-        logger.info('layer1EntryPoint.getBucketSize() ' + layer1EntryPoint.getBucketSize())
-        logger.info('layer1Node1.getBucketSize()' + layer1Node1.getBucketSize())
-        logger.info('layer1Node2.getBucketSize()' + layer1Node2.getBucketSize())
-        logger.info('layer1Node3.getBucketSize()' + layer1Node3.getBucketSize())
-        logger.info('layer1Node4.getBucketSize()' + layer1Node4.getBucketSize())
-
-        expect(layer1Node1.getBucketSize()).toEqual(layer0Node1.getBucketSize())
-        expect(layer1Node2.getBucketSize()).toEqual(layer0Node2.getBucketSize())
-        expect(layer1Node3.getBucketSize()).toEqual(layer0Node3.getBucketSize())
-        expect(layer1Node4.getBucketSize()).toEqual(layer0Node4.getBucketSize())
-
-        expect(layer1Node1.getKBucketPeers()).toContainValues(layer0Node1.getKBucketPeers())
-        expect(layer1Node2.getKBucketPeers()).toContainValues(layer0Node2.getKBucketPeers())
-        expect(layer1Node3.getKBucketPeers()).toContainValues(layer0Node3.getKBucketPeers())
-        expect(layer1Node4.getKBucketPeers()).toContainValues(layer0Node4.getKBucketPeers())
+        logger.info('layer1EntryPoint.getNumberOfNeighbors() ' + layer1EntryPoint.getNumberOfNeighbors())
+        logger.info('layer1Node1.getNumberOfNeighbors()' + layer1Node1.getNumberOfNeighbors())
+        logger.info('layer1Node2.getNumberOfNeighbors()' + layer1Node2.getNumberOfNeighbors())
+        logger.info('layer1Node3.getNumberOfNeighbors()' + layer1Node3.getNumberOfNeighbors())
+        logger.info('layer1Node4.getNumberOfNeighbors()' + layer1Node4.getNumberOfNeighbors())
+
+        expect(layer1Node1.getNumberOfNeighbors()).toEqual(layer0Node1.getNumberOfNeighbors())
+        expect(layer1Node2.getNumberOfNeighbors()).toEqual(layer0Node2.getNumberOfNeighbors())
+        expect(layer1Node3.getNumberOfNeighbors()).toEqual(layer0Node3.getNumberOfNeighbors())
+        expect(layer1Node4.getNumberOfNeighbors()).toEqual(layer0Node4.getNumberOfNeighbors())
+
+        expect(layer1Node1.getAllNeighborPeerDescriptors()).toContainValues(layer0Node1.getAllNeighborPeerDescriptors())
+        expect(layer1Node2.getAllNeighborPeerDescriptors()).toContainValues(layer0Node2.getAllNeighborPeerDescriptors())
+        expect(layer1Node3.getAllNeighborPeerDescriptors()).toContainValues(layer0Node3.getAllNeighborPeerDescriptors())
+        expect(layer1Node4.getAllNeighborPeerDescriptors()).toContainValues(layer0Node4.getAllNeighborPeerDescriptors())
 
     }, 60000)
 })

package/test/integration/MultipleEntryPointJoining.test.ts

@@ -42,9 +42,9 @@ describe('multiple entry point joining', () => {
                 node2.joinDht(entryPoints),
                 node3.joinDht(entryPoints)
             ])
-            expect(node1.getBucketSize()).toEqual(2)
-            expect(node2.getBucketSize()).toEqual(2)
-            expect(node3.getBucketSize()).toEqual(2)
+            expect(node1.getNumberOfNeighbors()).toEqual(2)
+            expect(node2.getNumberOfNeighbors()).toEqual(2)
+            expect(node3.getNumberOfNeighbors()).toEqual(2)
         })
 
         it('can join even if a node is offline', async () => {
@@ -53,8 +53,8 @@ describe('multiple entry point joining', () => {
                 node1.joinDht(entryPoints),
                 node2.joinDht(entryPoints)
             ])
-            expect(node1.getBucketSize()).toEqual(1)
-            expect(node2.getBucketSize()).toEqual(1)
+            expect(node1.getNumberOfNeighbors()).toEqual(1)
+            expect(node2.getNumberOfNeighbors()).toEqual(1)
         }, 10000)
     })
 
@@ -96,9 +96,9 @@ describe('multiple entry point joining', () => {
 
         it('non-entry point nodes can join', async () => {
             await node1.joinDht(entryPoints)
-            expect(node1.getBucketSize()).toEqual(2)
+            expect(node1.getNumberOfNeighbors()).toEqual(2)
             await node2.joinDht(entryPoints)
-            expect(node2.getBucketSize()).toEqual(3)
+            expect(node2.getNumberOfNeighbors()).toEqual(3)
         })
 
     })

package/test/integration/{MigrateData.test.ts → ReplicateData.test.ts}

@@ -16,7 +16,7 @@ const logger = new Logger(module)
 
 jest.setTimeout(60000)
 
-describe('Migrating data from node to node in DHT', () => {
+describe('Replicate data from node to node in DHT', () => {
     let entryPoint: DhtNode
     let nodes: DhtNode[]
     let entrypointDescriptor: PeerDescriptor
@@ -47,7 +47,7 @@ describe('Migrating data from node to node in DHT', () => {
         nodesById.set(entryPoint.getNodeId().toKey(), entryPoint)
 
         entrypointDescriptor = {
-            kademliaId: entryPoint.getNodeId().value,
+            nodeId: entryPoint.getNodeId().value,
             type: NodeType.NODEJS
         }
 
@@ -74,13 +74,18 @@ describe('Migrating data from node to node in DHT', () => {
         simulator.stop()
     })
 
-    it('Data migrates to the closest node no matter where it is stored', async () => {
+    it('Data replicates to the closest node no matter where it is stored', async () => {
         const dataKey = PeerID.fromString('3232323e12r31r3')
         const data = Any.pack(entrypointDescriptor, PeerDescriptor)
 
         // calculate offline which node is closest to the data
 
-        const sortedList = new SortedContactList<Contact>(dataKey, 10000)
+        const sortedList = new SortedContactList<Contact>({ 
+            referenceId: dataKey, 
+            maxSize: 10000, 
+            allowToContainReferenceId: true, 
+            emitEvents: false 
+        })
 
         nodes.forEach((node) => {
             sortedList.addContact(new Contact(node.getLocalPeerDescriptor())
@@ -106,7 +111,7 @@ describe('Migrating data from node to node in DHT', () => {
         logger.info('Nodes sorted according to distance to data with storing nodes marked are: ')
 
         closest.forEach((contact) => {
-            const node = nodesById.get(PeerID.fromValue(contact.getPeerDescriptor().kademliaId).toKey())!
+            const node = nodesById.get(PeerID.fromValue(contact.getPeerDescriptor().nodeId).toKey())!
             let hasDataMarker = ''
             
             // @ts-expect-error private field
@@ -134,7 +139,7 @@ describe('Migrating data from node to node in DHT', () => {
         logger.info('After join of 99 nodes: nodes sorted according to distance to data with storing nodes marked are: ')
 
         closest.forEach((contact) => {
-            const node = nodesById.get(PeerID.fromValue(contact.getPeerDescriptor().kademliaId).toKey())!
+            const node = nodesById.get(PeerID.fromValue(contact.getPeerDescriptor().nodeId).toKey())!
             let hasDataMarker = ''
 
             // @ts-expect-error private field
@@ -146,13 +151,13 @@ describe('Migrating data from node to node in DHT', () => {
             logger.info(getNodeIdFromPeerDescriptor(node.getLocalPeerDescriptor()) + hasDataMarker)
         })
 
-        const closestNode = nodesById.get(PeerID.fromValue(closest[0].getPeerDescriptor().kademliaId).toKey())!
+        const closestNode = nodesById.get(PeerID.fromValue(closest[0].getPeerDescriptor().nodeId).toKey())!
 
         // @ts-expect-error private field
-        expect(closestNode.localDataStore.getEntry(dataKey)).toBeTruthy()
+        expect(closestNode.localDataStore.getEntry(dataKey).size).toBeGreaterThanOrEqual(1)
     }, 180000)
 
-    it('Data migrates to the last remaining node if all other nodes leave gracefully', async () => {
+    it('Data replicates to the last remaining node if all other nodes leave gracefully', async () => {
         const dataKey = PeerID.fromString('3232323e12r31r3')
         const data = Any.pack(entrypointDescriptor, PeerDescriptor)
 
@@ -198,7 +203,7 @@ describe('Migrating data from node to node in DHT', () => {
         logger.info('data of ' + randomIndices[0] + ' was ' + nodes[randomIndices[0]].localDataStore.getEntry(dataKey))
 
         // @ts-expect-error private field
-        expect(nodes[randomIndices[0]].localDataStore.getEntry(dataKey)).toBeTruthy()
+        expect(nodes[randomIndices[0]].localDataStore.getEntry(dataKey).size).toBeGreaterThanOrEqual(1)
 
     }, 180000)
 })

package/test/integration/RouteMessage.test.ts

@@ -32,7 +32,7 @@ describe('Route Message With Mock Connections', () => {
         entryPoint = await createMockConnectionDhtNode(entryPointId, simulator)
 
         entryPointDescriptor = {
-            kademliaId: entryPoint.getNodeId().value,
+            nodeId: entryPoint.getNodeId().value,
             type: NodeType.NODEJS
         }
 
@@ -141,7 +141,7 @@ describe('Route Message With Mock Connections', () => {
                 numsOfReceivedMessages[node.getNodeId().toKey()] = numsOfReceivedMessages[node.getNodeId().toKey()] + 1
                 try {
                     const target = receiveMatrix[parseInt(node.getNodeId().toString()) - 1]
-                    target[parseInt(PeerID.fromValue(msg.sourceDescriptor!.kademliaId).toString()) - 1]++
+                    target[parseInt(PeerID.fromValue(msg.sourceDescriptor!.nodeId).toString()) - 1]++
                 } catch (e) {
                     console.error(e)
                 }

package/test/integration/RouterRpcRemote.test.ts

@@ -12,11 +12,11 @@ describe('RemoteRouter', () => {
     let serverRpcCommunicator: RpcCommunicator
     const serviceId = 'test'
     const clientPeerDescriptor: PeerDescriptor = {
-        kademliaId: generateId('client'),
+        nodeId: generateId('client'),
         type: NodeType.NODEJS
     }
     const serverPeerDescriptor: PeerDescriptor = {
-        kademliaId: generateId('server'),
+        nodeId: generateId('server'),
         type: NodeType.NODEJS
     }
 

package/test/integration/RpcErrors.test.ts

@@ -36,12 +36,12 @@ describe('RPC errors', () => {
     let simulator: Simulator
 
     const peerDescriptor1: PeerDescriptor = {
-        kademliaId: PeerID.fromString('peer1').value,
+        nodeId: PeerID.fromString('peer1').value,
         type: NodeType.NODEJS,
     }
 
     const peerDescriptor2: PeerDescriptor = {
-        kademliaId: PeerID.fromString('peer2').value,
+        nodeId: PeerID.fromString('peer2').value,
         type: NodeType.NODEJS,
     }
 

package/test/integration/ScaleDownDht.test.ts

@@ -4,6 +4,7 @@ import { NodeType, PeerDescriptor } from '../../src/proto/packages/dht/protos/Dh
 import { createMockConnectionDhtNode } from '../utils/utils'
 import { areEqualPeerDescriptors, getNodeIdFromPeerDescriptor } from '../../src/helpers/peerIdFromPeerDescriptor'
 import { Logger } from '@streamr/utils'
+import { getRandomRegion } from '../../src/connection/simulator/pings'
 
 const logger = new Logger(module)
 
@@ -24,8 +25,9 @@ describe('Scaling down a Dht network', () => {
         nodes.push(entryPoint)
 
         entrypointDescriptor = {
-            kademliaId: entryPoint.getNodeId().value,
-            type: NodeType.NODEJS
+            nodeId: entryPoint.getNodeId().value,
+            type: NodeType.NODEJS,
+            region: getRandomRegion()
         }
 
         for (let i = 1; i < NUM_NODES; i++) {