@streamr/trackerless-network 100.0.0-testnet-three.2 → 100.0.0-testnet-three.4

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

package/tsconfig.jest.json

@@ -6,7 +6,8 @@
     },
     "include": [
         "src/**/*",
-        "test/**/*"
+        "test/**/*",
+        "package.json"
     ],
     "references": [
         { "path": "../protocol/tsconfig.node.json" },

package/tsconfig.node.json

@@ -7,7 +7,8 @@
     "include": [
         "src/**/*",
         "test/benchmark/first-message.ts",
-        "test/utils/utils.ts"
+        "test/utils/utils.ts",
+        "package.json"
     ],
     "references": [
         { "path": "../protocol/tsconfig.node.json" },