@streamr/trackerless-network 100.0.0-testnet-three.1 → 100.0.0-testnet-three.3

package/test/unit/NeighborFinder.test.ts

@@ -3,12 +3,12 @@ import { NodeList } from '../../src/logic/NodeList'
 import { waitForCondition } from '@streamr/utils'
 import { range } from 'lodash'
 import { expect } from 'expect'
-import { createMockDeliveryRpcRemote, createRandomNodeId } from '../utils/utils'
-import { DhtAddress, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { createMockDeliveryRpcRemote } from '../utils/utils'
+import { DhtAddress, createRandomDhtAddress, getNodeIdFromPeerDescriptor } from '@streamr/dht'
 
 describe('NeighborFinder', () => {
 
-    const nodeId = createRandomNodeId()
+    const nodeId = createRandomDhtAddress()
     let neighbors: NodeList
     let nearbyNodeView: NodeList
     let neighborFinder: NeighborFinder

package/test/unit/NeighborUpdateRpcLocal.test.ts

@@ -13,7 +13,7 @@ describe('NeighborUpdateRpcLocal', () => {
 
     const streamPartId = StreamPartIDUtils.parse('stream#0')
     const localPeerDescriptor = createMockPeerDescriptor()
-    const neighborCount = 4
+    const neighborTargetCount = 4
 
     let rpcLocal: NeighborUpdateRpcLocal
     let neighbors: NodeList
@@ -34,11 +34,14 @@ describe('NeighborUpdateRpcLocal', () => {
 
     beforeEach(() => {
         rpcCommunicator = new ListeningRpcCommunicator('mock', new MockTransport())
-        neighbors = new NodeList(getNodeIdFromPeerDescriptor(localPeerDescriptor), neighborCount + 1)
-        nearbyNodeView = new NodeList(getNodeIdFromPeerDescriptor(localPeerDescriptor), neighborCount)
+        neighbors = new NodeList(getNodeIdFromPeerDescriptor(localPeerDescriptor), neighborTargetCount + 1)
+        nearbyNodeView = new NodeList(getNodeIdFromPeerDescriptor(localPeerDescriptor), neighborTargetCount)
         neighborFinder = {
             start: jest.fn()
         } as any
+        const connectionLocker = {
+            unlockConnection: jest.fn()
+        } as any
 
         rpcLocal = new NeighborUpdateRpcLocal({
             localPeerDescriptor,
@@ -47,7 +50,8 @@ describe('NeighborUpdateRpcLocal', () => {
             neighborFinder,
             streamPartId,
             rpcCommunicator,
-            neighborCount
+            neighborTargetCount,
+            connectionLocker
         })
     })
 
@@ -56,21 +60,21 @@ describe('NeighborUpdateRpcLocal', () => {
     })
 
     it('response contains neighbor list of expected size', async () => {
-        addNeighbors(neighborCount)
+        addNeighbors(neighborTargetCount)
         const res = await rpcLocal.neighborUpdate({
             streamPartId,
             neighborDescriptors: [localPeerDescriptor],
             removeMe: false
         }, { incomingSourceDescriptor: createMockPeerDescriptor() } as any)
-        expect(res.neighborDescriptors.length).toEqual(neighborCount)
+        expect(res.neighborDescriptors.length).toEqual(neighborTargetCount)
     })
 
     it('updates contacts based on callers neighbors', async () => {
-        addNeighbors(neighborCount)
+        addNeighbors(neighborTargetCount)
         expect(nearbyNodeView.size()).toEqual(0)
         await rpcLocal.neighborUpdate({
             streamPartId,
-            neighborDescriptors: range(neighborCount).map(() => createMockPeerDescriptor()),
+            neighborDescriptors: range(neighborTargetCount).map(() => createMockPeerDescriptor()),
             removeMe: false
         }, { incomingSourceDescriptor: createMockPeerDescriptor() } as any)
         expect(nearbyNodeView.size()).toEqual(4)
@@ -112,10 +116,10 @@ describe('NeighborUpdateRpcLocal', () => {
             DeliveryRpcClient
         )
         neighbors.add(neighbor)
-        addNeighbors(neighborCount)
+        addNeighbors(neighborTargetCount)
         const res = await rpcLocal.neighborUpdate({
             streamPartId,
-            neighborDescriptors: [localPeerDescriptor, ...range(neighborCount).map(() => createMockPeerDescriptor())],
+            neighborDescriptors: [localPeerDescriptor, ...range(neighborTargetCount).map(() => createMockPeerDescriptor())],
             removeMe: false
         }, { incomingSourceDescriptor: caller } as any)
         expect(res.removeMe).toEqual(true)

package/test/unit/NodeList.test.ts

@@ -2,6 +2,7 @@ import {
     ListeningRpcCommunicator,
     NodeType,
     PeerDescriptor,
+    createRandomDhtAddress,
     getDhtAddressFromRaw,
     getNodeIdFromPeerDescriptor,
 } from '@streamr/dht'
@@ -11,7 +12,7 @@ import { DeliveryRpcRemote } from '../../src/logic/DeliveryRpcRemote'
 import { NodeList } from '../../src/logic/NodeList'
 import { formStreamPartDeliveryServiceId } from '../../src/logic/formStreamPartDeliveryServiceId'
 import { DeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { createMockPeerDescriptor, createRandomNodeId } from '../utils/utils'
+import { createMockPeerDescriptor } from '../utils/utils'
 import { MockTransport } from '../utils/mock/Transport'
 
 const streamPartId = StreamPartIDUtils.parse('stream#0')
@@ -25,7 +26,7 @@ describe('NodeList', () => {
         new Uint8Array([1, 1, 4]),
         new Uint8Array([1, 1, 5])
     ]
-    const ownId = createRandomNodeId()
+    const ownId = createRandomDhtAddress()
     let nodeList: NodeList
 
     const createRemoteGraphNode = (peerDescriptor: PeerDescriptor) => {
@@ -135,7 +136,7 @@ describe('NodeList', () => {
     })
 
     it('items are in insertion order', () => {
-        const list = new NodeList(createRandomNodeId(), 100)
+        const list = new NodeList(createRandomDhtAddress(), 100)
         const item1 = createRemoteGraphNode(createMockPeerDescriptor())
         const item2 = createRemoteGraphNode(createMockPeerDescriptor())
         const item3 = createRemoteGraphNode(createMockPeerDescriptor())

package/test/unit/RandomGraphNode.test.ts

@@ -66,19 +66,19 @@ describe('RandomGraphNode', () => {
         expect(ids[0]).toEqual(getNodeIdFromPeerDescriptor(mockRemote.getPeerDescriptor()))
     })
 
-    it('Adds Closest Nodes from layer1 newContact event to nearbyNodeView', async () => {
+    it('Adds Closest Nodes from layer1 contactAdded event to nearbyNodeView', async () => {
         const peerDescriptor1 = createMockPeerDescriptor()
         const peerDescriptor2 = createMockPeerDescriptor()
-        layer1Node.emit('newContact', peerDescriptor1, [peerDescriptor1, peerDescriptor2])
+        layer1Node.emit('contactAdded', peerDescriptor1, [peerDescriptor1, peerDescriptor2])
         await waitForCondition(() => nearbyNodeView.size() === 2)
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor1))).toBeTruthy()
         expect(nearbyNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor2))).toBeTruthy()
     })
 
-    it('Adds Random Nodes from layer1 newRandomContact event to randomNodeView', async () => {
+    it('Adds Random Nodes from layer1 randomContactAdded event to randomNodeView', async () => {
         const peerDescriptor1 = createMockPeerDescriptor()
         const peerDescriptor2 = createMockPeerDescriptor()
-        layer1Node.emit('newRandomContact', peerDescriptor1, [peerDescriptor1, peerDescriptor2])
+        layer1Node.emit('randomContactAdded', peerDescriptor1, [peerDescriptor1, peerDescriptor2])
         await waitForCondition(() => randomNodeView.size() === 2)
         expect(randomNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor1))).toBeTruthy()
         expect(randomNodeView.get(getNodeIdFromPeerDescriptor(peerDescriptor2))).toBeTruthy()
@@ -88,7 +88,7 @@ describe('RandomGraphNode', () => {
         const peerDescriptor1 = createMockPeerDescriptor()
         const peerDescriptor2 = createMockPeerDescriptor()
         layer1Node.addNewRandomPeerToKBucket()
-        layer1Node.emit('newContact', peerDescriptor1, [peerDescriptor1, peerDescriptor2])
+        layer1Node.emit('contactAdded', peerDescriptor1, [peerDescriptor1, peerDescriptor2])
         await waitForCondition(() => {
             return nearbyNodeView.size() === 3
         }, 20000)

package/test/utils/utils.ts

@@ -1,13 +1,11 @@
-import { randomBytes } from 'crypto'
 import { 
     ConnectionLocker,
-    DhtAddress,
     DhtNode,
     NodeType,
     PeerDescriptor,
     Simulator,
     SimulatorTransport,
-    getDhtAddressFromRaw,
+    createRandomDhtAddress,
     getRandomRegion,
     getRawFromDhtAddress
 } from '@streamr/dht'
@@ -91,14 +89,10 @@ export const createStreamMessage = (
     return msg
 }
 
-export const createRandomNodeId = (): DhtAddress => {
-    return getDhtAddressFromRaw(randomBytes(10))
-}
-
 export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'nodeId' | 'type'>): PeerDescriptor => {
     return {
         ...opts,
-        nodeId: getRawFromDhtAddress(createRandomNodeId()),
+        nodeId: getRawFromDhtAddress(createRandomDhtAddress()),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }