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

package/test/unit/HandshakeRpcLocal.test.ts

@@ -88,7 +88,7 @@ describe('HandshakeRpcLocal', () => {
         const req: InterleaveNotice = {
             streamPartId: STREAM_PART_ID,
             interleaveTargetDescriptor: {
-                kademliaId: hexToBinary('0x2222'),
+                nodeId: hexToBinary('0x2222'),
                 type: NodeType.NODEJS
             }
 
@@ -103,7 +103,7 @@ describe('HandshakeRpcLocal', () => {
         const req: InterleaveNotice = {
             streamPartId: StreamPartIDUtils.parse('other-stream#0'),
             interleaveTargetDescriptor: {
-                kademliaId: hexToBinary('0x2222'),
+                nodeId: hexToBinary('0x2222'),
                 type: NodeType.NODEJS
             }
         }

package/test/unit/NodeList.test.ts

@@ -53,7 +53,7 @@ describe('NodeList', () => {
         nodeList = new NodeList(ownId, 6)
         for (const id of ids) {
             const peerDescriptor: PeerDescriptor = {
-                kademliaId: id,
+                nodeId: id,
                 type: NodeType.NODEJS
             }
             nodeList.add(await createRemoteGraphNode(peerDescriptor))
@@ -70,7 +70,7 @@ describe('NodeList', () => {
 
     it('add', async () => {
         const newDescriptor = {
-            kademliaId: new Uint8Array([1, 2, 3]),
+            nodeId: new Uint8Array([1, 2, 3]),
             type: NodeType.NODEJS
         }
         const newNode = await createRemoteGraphNode(newDescriptor)
@@ -78,7 +78,7 @@ describe('NodeList', () => {
         expect(nodeList.hasNode(newDescriptor)).toEqual(true)
 
         const newDescriptor2 = {
-            kademliaId: new Uint8Array([1, 2, 4]),
+            nodeId: new Uint8Array([1, 2, 4]),
             type: NodeType.NODEJS
         }
         const newNode2 = await createRemoteGraphNode(newDescriptor2)

package/test/unit/RandomGraphNode.test.ts

@@ -88,9 +88,11 @@ describe('RandomGraphNode', () => {
         const peerDescriptor2 = createMockPeerDescriptor()
         layer1Node.addNewRandomPeerToKBucket()
         layer1Node.emit('newContact', peerDescriptor1, [peerDescriptor1, peerDescriptor2])
-        await waitForCondition(() => nearbyNodeView.size() === 3)
+        await waitForCondition(() => {
+            return nearbyNodeView.size() === 3
+        }, 20000)
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor1))).toBeTruthy()
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor2))).toBeTruthy()
-    })
+    }, 25000)
 
 })

package/test/utils/mock/MockLayer1Node.ts

@@ -16,11 +16,11 @@ export class MockLayer1Node extends EventEmitter implements Layer1Node {
         return []
     }
 
-    getKBucketPeers(): PeerDescriptor[] {
+    getAllNeighborPeerDescriptors(): PeerDescriptor[] {
         return this.kbucketPeers
     }
 
-    getBucketSize(): number {
+    getNumberOfNeighbors(): number {
         return this.kbucketPeers.length
     }
 

package/test/utils/utils.ts

@@ -80,10 +80,10 @@ export const createRandomNodeId = (): NodeID => {
     return randomBytes(10).toString('hex') as NodeID
 }
 
-export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'kademliaId' | 'type'>): PeerDescriptor => {
+export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'nodeId' | 'type'>): PeerDescriptor => {
     return {
         ...opts,
-        kademliaId: hexToBinary(createRandomNodeId()),
+        nodeId: hexToBinary(createRandomNodeId()),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }