@streamr/dht 100.0.0-pretestnet.4 → 100.0.0-testnet-one.0

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

@@ -6,7 +6,7 @@ const NUM_OF_NODES_PER_KBUCKET = 8
 
 describe('Layer1 Scale', () => {
     const epPeerDescriptor: PeerDescriptor = {
-        kademliaId: PeerID.fromString('entrypoint').value,
+        nodeId: PeerID.fromString('entrypoint').value,
         type: NodeType.NODEJS,
         websocket: { host: '127.0.0.1', port: 43225, tls: false }
     }

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

@@ -6,7 +6,7 @@ const NUM_OF_NODES_PER_KBUCKET = 8
 
 describe('Layer1 Scale', () => {
     const epPeerDescriptor: PeerDescriptor = {
-        kademliaId: PeerID.fromString('0').value,
+        nodeId: PeerID.fromString('0').value,
         type: NodeType.NODEJS,
         websocket: { host: '127.0.0.1', port: 43228, tls: false }
     }

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

@@ -7,7 +7,7 @@ import { areEqualPeerDescriptors } from '../../src/helpers/peerIdFromPeerDescrip
 
 describe('Websocket IConnection Requests', () => {
     const epPeerDescriptor: PeerDescriptor = {
-        kademliaId: PeerID.fromString('3').value,
+        nodeId: PeerID.fromString('3').value,
         type: NodeType.NODEJS,
         websocket: { host: '127.0.0.1', port: 10021, tls: false }
     }

package/test/end-to-end/memory-leak.test.ts

@@ -11,7 +11,7 @@ describe('memory leak', () => {
 
     it('send message', async () => {
         const entryPointDescriptor = {
-            kademliaId: randomBytes(10),
+            nodeId: randomBytes(10),
             type: NodeType.NODEJS,
             websocket: {
                 host: '127.0.0.1',
@@ -20,7 +20,7 @@ describe('memory leak', () => {
             }
         }
         let entryPoint: DhtNode | undefined = new DhtNode({
-            peerId: binaryToHex(entryPointDescriptor.kademliaId),
+            peerId: binaryToHex(entryPointDescriptor.nodeId),
             websocketHost: entryPointDescriptor.websocket!.host,
             websocketPortRange: {
                 min: entryPointDescriptor.websocket.port,
@@ -33,20 +33,16 @@ describe('memory leak', () => {
         await entryPoint.joinDht([entryPointDescriptor])
         let sender: DhtNode | undefined = new DhtNode({})
         let receiver: DhtNode | undefined = new DhtNode({})
-        /*TODO should this work? await Promise.all([
-            async () => {
+        await Promise.all([
+            (async () => {
                 await sender.start()
                 await sender.joinDht([entryPointDescriptor])
-            },
-            async () => {
+            })(),
+            (async () => {
                 await receiver.start()
                 await receiver.joinDht([entryPointDescriptor])
-            }
-        ])*/
-        await sender.start()
-        await sender.joinDht([entryPointDescriptor])
-        await receiver.start()
-        await receiver.joinDht([entryPointDescriptor])
+            })()
+        ])
 
         let receivedMessage: Message | undefined = undefined
         receiver.on('message', (msg: Message) => receivedMessage = msg)

package/test/integration/ConnectionLocking.test.ts

@@ -21,12 +21,12 @@ const createConnectionManager = (localPeerDescriptor: PeerDescriptor, transport:
 describe('Connection Locking', () => {
 
     const mockPeerDescriptor1: PeerDescriptor = {
-        kademliaId: PeerID.fromString('mock1').value,
+        nodeId: PeerID.fromString('mock1').value,
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
     const mockPeerDescriptor2: PeerDescriptor = {
-        kademliaId: PeerID.fromString('mock2').value,
+        nodeId: PeerID.fromString('mock2').value,
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }

package/test/integration/ConnectionManager.test.ts

@@ -8,7 +8,7 @@ import { Logger, MetricsContext, waitForEvent3 } from '@streamr/utils'
 import { SimulatorTransport } from '../../src/exports'
 import { DefaultConnectorFacade, DefaultConnectorFacadeConfig } from '../../src/connection/ConnectorFacade'
 import { MarkOptional } from 'ts-essentials'
-import { createRandomKademliaId } from '../../src/helpers/kademliaId'
+import { createRandomNodeId } from '../../src/helpers/nodeId'
 import { TransportEvents } from '../../src/transport/ITransport'
 
 const logger = new Logger(module)
@@ -18,20 +18,20 @@ describe('ConnectionManager', () => {
     const serviceId = 'demo'
 
     const mockPeerDescriptor1: PeerDescriptor = {
-        kademliaId: PeerID.fromString('tester1').value,
+        nodeId: PeerID.fromString('tester1').value,
         type: NodeType.NODEJS
     }
     const mockPeerDescriptor2: PeerDescriptor = {
-        kademliaId: PeerID.fromString('tester2').value,
+        nodeId: PeerID.fromString('tester2').value,
         type: NodeType.NODEJS
     }
 
     const mockPeerDescriptor3: PeerDescriptor = {
-        kademliaId: PeerID.fromString('tester3').value,
+        nodeId: PeerID.fromString('tester3').value,
         type: NodeType.NODEJS
     }
     const mockPeerDescriptor4: PeerDescriptor = {
-        kademliaId: PeerID.fromString('tester4').value,
+        nodeId: PeerID.fromString('tester4').value,
         type: NodeType.NODEJS
     }
     const simulator = new Simulator()
@@ -89,7 +89,7 @@ describe('ConnectionManager', () => {
             transport: mockTransport,
             websocketPortRange: { min: 9992, max: 9992 },
             entryPoints: [
-                { kademliaId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { host: '127.0.0.1', port: 12345, tls: false } }
+                { nodeId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { host: '127.0.0.1', port: 12345, tls: false } }
             ]
         })
 
@@ -112,7 +112,7 @@ describe('ConnectionManager', () => {
             transport: mockConnectorTransport2,
             websocketPortRange: { min: 9994, max: 9994 },
             entryPoints: [
-                { kademliaId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { host: '127.0.0.1', port: 9993, tls: false } }
+                { nodeId: Uint8Array.from([1, 2, 3]), type: NodeType.NODEJS, websocket: { host: '127.0.0.1', port: 9993, tls: false } }
             ]
         })
 
@@ -306,7 +306,7 @@ describe('ConnectionManager', () => {
         await connectionManager4.stop()
     })
 
-    it('Cannot send to own WebsocketServer if kademliaIds do not match', async () => {
+    it('Cannot send to own WebsocketServer if nodeIds do not match', async () => {
         const connectionManager1 = createConnectionManager({
             transport: mockTransport,
             websocketHost: '127.0.0.1',
@@ -317,7 +317,7 @@ describe('ConnectionManager', () => {
         expect(createLocalPeerDescriptor.mock.calls[0][0].host).toEqual('127.0.0.1')
         
         const peerDescriptor = connectionManager1.getLocalPeerDescriptor()
-        peerDescriptor.kademliaId = new Uint8Array([12, 12, 12, 12])
+        peerDescriptor.nodeId = new Uint8Array([12, 12, 12, 12])
         const msg: Message = {
             serviceId,
             messageType: MessageType.RPC,
@@ -335,10 +335,10 @@ describe('ConnectionManager', () => {
         await connectionManager1.stop()
     })
 
-    it('Cannot send to a WebSocketServer if kademliaIds do not match', async () => {
+    it('Cannot send to a WebSocketServer if nodeIds do not match', async () => {
 
         const peerDescriptor1 = {
-            kademliaId: createRandomKademliaId(),
+            nodeId: createRandomNodeId(),
             type: NodeType.NODEJS,
             websocket: {
                 host: '127.0.0.1',
@@ -348,7 +348,7 @@ describe('ConnectionManager', () => {
         }
 
         const peerDescriptor2 = {
-            kademliaId: createRandomKademliaId(),
+            nodeId: createRandomNodeId(),
             type: NodeType.NODEJS,
             websocket: {
                 host: '127.0.0.1',
@@ -379,8 +379,8 @@ describe('ConnectionManager', () => {
             messageType: MessageType.RPC,
             messageId: '1',
             targetDescriptor: {
-                // This is not the correct kademliaId of peerDescriptor2
-                kademliaId: new Uint8Array([1, 2, 3, 4]),
+                // This is not the correct nodeId of peerDescriptor2
+                nodeId: new Uint8Array([1, 2, 3, 4]),
                 type: NodeType.NODEJS,
                 websocket: peerDescriptor2.websocket
             },

package/test/integration/DhtJoinPeerDiscovery.test.ts

@@ -11,7 +11,7 @@ const runTest = async (latencyType: LatencyType) => {
     const entryPointId = '0'
     const entryPoint = await createMockConnectionDhtNode(entryPointId, simulator, undefined, NUM_OF_NODES_PER_KBUCKET)
     const entrypointDescriptor = {
-        kademliaId: entryPoint.getNodeId().value,
+        nodeId: entryPoint.getNodeId().value,
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }

package/test/integration/DhtNodeExternalAPI.test.ts

@@ -1,9 +1,10 @@
 import { DhtNode } from '../../src/dht/DhtNode'
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
-import { createMockConnectionDhtNode } from '../utils/utils'
+import { createMockConnectionDhtNode, createMockPeerDescriptor } from '../utils/utils'
 import { Any } from '../../src/proto/google/protobuf/any'
 import { PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { PeerID } from '../../src/helpers/PeerID'
+import { areEqualPeerDescriptors } from '../../src/helpers/peerIdFromPeerDescriptor'
+import { createRandomNodeId } from '../../src/helpers/nodeId'
 
 describe('DhtNodeExternalApi', () => {
 
@@ -28,7 +29,7 @@ describe('DhtNodeExternalApi', () => {
 
     it('findData happy path', async () => {
         const data = Any.pack(dhtNode1.getLocalPeerDescriptor(), PeerDescriptor)
-        const key = PeerID.fromString('key').value
+        const key = createRandomNodeId()
         await dhtNode1.storeDataToDht(key, data)
 
         const foundData = await remote.findDataViaPeer(key, dhtNode1.getLocalPeerDescriptor())
@@ -36,17 +37,19 @@ describe('DhtNodeExternalApi', () => {
     })
     
     it('findData returns empty array if no data found', async () => {
-        const foundData = await remote.findDataViaPeer(PeerID.fromString('key').value, dhtNode1.getLocalPeerDescriptor())
+        const foundData = await remote.findDataViaPeer(createRandomNodeId(), dhtNode1.getLocalPeerDescriptor())
         expect(foundData).toEqual([])
     })
 
     it('external store data happy path', async () => {
-        const data = Any.pack(dhtNode1.getLocalPeerDescriptor(), PeerDescriptor)
-        const key = PeerID.fromString('key').value 
+        const storedPeerDescriptor = createMockPeerDescriptor()
+        const data = Any.pack(storedPeerDescriptor, PeerDescriptor)
+        const key = createRandomNodeId()
 
         await remote.storeDataViaPeer(key, data, dhtNode1.getLocalPeerDescriptor())
         const foundData = await remote.findDataViaPeer(key, dhtNode1.getLocalPeerDescriptor())
-        expect(Any.unpack(foundData[0].data!, PeerDescriptor)).toEqual(dhtNode1.getLocalPeerDescriptor())
+        expect(areEqualPeerDescriptors(Any.unpack(foundData[0].data!, PeerDescriptor), storedPeerDescriptor)).toEqual(true)
+        expect(areEqualPeerDescriptors(foundData[0].creator!, remote.getLocalPeerDescriptor())).toEqual(true)
     })
   
 })

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
     }
 
@@ -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
         }
 

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,7 +74,7 @@ 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)
 
@@ -106,7 +106,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 +134,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 +146,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 +198,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++) {

package/test/integration/SimultaneousConnections.test.ts

@@ -24,12 +24,12 @@ describe('SimultaneousConnections', () => {
     let simulatorTransport2: SimulatorTransport
 
     const peerDescriptor1 = {
-        kademliaId: PeerID.fromString('mock1').value,
+        nodeId: PeerID.fromString('mock1').value,
         type: NodeType.NODEJS
     }
 
     const peerDescriptor2 = {
-        kademliaId: PeerID.fromString('mock2').value,
+        nodeId: PeerID.fromString('mock2').value,
         type: NodeType.NODEJS
     }
 
@@ -94,7 +94,7 @@ describe('SimultaneousConnections', () => {
         let connectionManager2: ConnectionManager
 
         const wsPeer1: PeerDescriptor = {
-            kademliaId: PeerID.fromString('mock1').value,
+            nodeId: PeerID.fromString('mock1').value,
             type: NodeType.NODEJS,
             websocket: {
                 host: '127.0.0.1',
@@ -104,7 +104,7 @@ describe('SimultaneousConnections', () => {
         }
 
         const wsPeer2: PeerDescriptor = {
-            kademliaId: PeerID.fromString('mock2').value,
+            nodeId: PeerID.fromString('mock2').value,
             type: NodeType.NODEJS,
             websocket: {
                 host: '127.0.0.1',
@@ -177,7 +177,7 @@ describe('SimultaneousConnections', () => {
         let connectionManager2: ConnectionManager
 
         const wsPeer1: PeerDescriptor = {
-            kademliaId: PeerID.fromString('mock1').value,
+            nodeId: PeerID.fromString('mock1').value,
             type: NodeType.NODEJS,
             websocket: {
                 host: '127.0.0.1',
@@ -187,7 +187,7 @@ describe('SimultaneousConnections', () => {
         }
 
         const wsPeer2: PeerDescriptor = {
-            kademliaId: PeerID.fromString('mock2').value,
+            nodeId: PeerID.fromString('mock2').value,
             type: NodeType.NODEJS
         }
 
@@ -251,12 +251,12 @@ describe('SimultaneousConnections', () => {
         let connectionManager2: ConnectionManager
 
         const wrtcPeer1: PeerDescriptor = {
-            kademliaId: PeerID.fromString('mock1').value,
+            nodeId: PeerID.fromString('mock1').value,
             type: NodeType.NODEJS
         }
 
         const wrtcPeer2: PeerDescriptor = {
-            kademliaId: PeerID.fromString('mock2').value,
+            nodeId: PeerID.fromString('mock2').value,
             type: NodeType.NODEJS
         }
 

package/test/integration/Store.test.ts

@@ -1,10 +1,10 @@
 import { LatencyType, Simulator } from '../../src/connection/simulator/Simulator'
 import { DhtNode } from '../../src/dht/DhtNode'
 import { PeerDescriptor } from '../../src/proto/packages/dht/protos/DhtRpc'
-import { createMockConnectionDhtNode, waitConnectionManagersReadyForTesting } from '../utils/utils'
-import { PeerID } from '../../src/helpers/PeerID'
+import { createMockConnectionDhtNode, createMockPeerDescriptor, waitConnectionManagersReadyForTesting } from '../utils/utils'
 import { areEqualPeerDescriptors } from '../../src/helpers/peerIdFromPeerDescriptor'
 import { Any } from '../../src/proto/google/protobuf/any'
+import { createRandomNodeId } from '../../src/helpers/nodeId'
 
 describe('Storing data in DHT', () => {
     let entryPoint: DhtNode
@@ -46,24 +46,44 @@ describe('Storing data in DHT', () => {
 
     it('Storing data works', async () => {
         const storingNodeIndex = 34
-        const dataKey = PeerID.fromString('3232323e12r31r3')
-        const data = Any.pack(entrypointDescriptor, PeerDescriptor)
-        const successfulStorers = await nodes[storingNodeIndex].storeDataToDht(dataKey.value, data)
+        const dataKey = createRandomNodeId()
+        const storedData = createMockPeerDescriptor()
+        const data = Any.pack(storedData, PeerDescriptor)
+        const successfulStorers = await nodes[storingNodeIndex].storeDataToDht(dataKey, data)
         expect(successfulStorers.length).toBeGreaterThan(4)
-    }, 90000)
+    }, 30000)
 
     it('Storing and getting data works', async () => {
         const storingNode = getRandomNode()
-        const dataKey = PeerID.fromString('3232323e12r31r3')
-        const data = Any.pack(entrypointDescriptor, PeerDescriptor)
-        const successfulStorers = await storingNode.storeDataToDht(dataKey.value, data)
+        const dataKey = createRandomNodeId()
+        const storedData = createMockPeerDescriptor()
+        const data = Any.pack(storedData, PeerDescriptor)
+        const successfulStorers = await storingNode.storeDataToDht(dataKey, data)
         expect(successfulStorers.length).toBeGreaterThan(4)
 
         const fetchingNode = getRandomNode()
-        const results = await fetchingNode.getDataFromDht(dataKey.value)
+        const results = await fetchingNode.getDataFromDht(dataKey)
         results.forEach((entry) => {
-            const fetchedDescriptor = Any.unpack(entry.data!, PeerDescriptor)
-            expect(areEqualPeerDescriptors(fetchedDescriptor, entrypointDescriptor)).toBeTrue()
+            const foundData = Any.unpack(entry.data!, PeerDescriptor)
+            expect(areEqualPeerDescriptors(foundData, storedData)).toBeTrue()
         })
-    }, 90000)
+    }, 30000)
+
+    it('storing with explicit creator', async () => {
+        const storingNode = getRandomNode()
+        const dataKey = createRandomNodeId()
+        const storedData = createMockPeerDescriptor()
+        const data = Any.pack(storedData, PeerDescriptor)
+        const requestor = createMockPeerDescriptor()
+        const successfulStorers = await storingNode.storeDataToDht(dataKey, data, requestor)
+        expect(successfulStorers.length).toBeGreaterThan(4)
+
+        const fetchingNode = getRandomNode()
+        const results = await fetchingNode.getDataFromDht(dataKey)
+        results.forEach((entry) => {
+            const foundData = Any.unpack(entry.data!, PeerDescriptor)
+            expect(areEqualPeerDescriptors(foundData, storedData)).toBeTrue()
+            expect(areEqualPeerDescriptors(entry.creator!, requestor)).toBeTrue()
+        })
+    }, 30000)
 })