@streamr/trackerless-network 101.1.2 → 102.0.0-beta.1

package/src/logic/temporary-connection/TemporaryConnectionRpcRemote.ts

@@ -1,6 +1,6 @@
-import { RpcRemote, getNodeIdFromPeerDescriptor } from '@streamr/dht'
+import { RpcRemote, toNodeId } from '@streamr/dht'
 import { Logger } from '@streamr/utils'
-import { TemporaryConnectionRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { TemporaryConnectionRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 const logger = new Logger(module)
 
@@ -11,7 +11,7 @@ export class TemporaryConnectionRpcRemote extends RpcRemote<TemporaryConnectionR
             const response = await this.getClient().openConnection({}, this.formDhtRpcOptions())
             return response.accepted
         } catch (err: any) {
-            logger.debug(`temporaryConnection to ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())} failed`, { err })
+            logger.debug(`temporaryConnection to ${toNodeId(this.getPeerDescriptor())} failed`, { err })
             return false
         }
     }
@@ -23,7 +23,7 @@ export class TemporaryConnectionRpcRemote extends RpcRemote<TemporaryConnectionR
                 notification: true
             }))
         } catch (err) {
-            logger.trace(`closeConnection to ${getNodeIdFromPeerDescriptor(this.getPeerDescriptor())} failed`, { err })
+            logger.trace(`closeConnection to ${toNodeId(this.getPeerDescriptor())} failed`, { err })
         }
     }
 }

package/src/logic/utils.ts

@@ -1,13 +1,13 @@
-import { DuplicateMessageDetector, NumberPair } from './DuplicateMessageDetector' 
-import { MessageID, MessageRef } from '../proto/packages/trackerless-network/protos/NetworkRpc'
-import { binaryToHex } from '@streamr/utils'
+import { toUserId } from '@streamr/utils'
+import { MessageID, MessageRef } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { DuplicateMessageDetector, NumberPair } from './DuplicateMessageDetector'
 
 export const markAndCheckDuplicate = (
     duplicateDetectors: Map<string, DuplicateMessageDetector>,
     currentMessage: MessageID, 
     previousMessageRef?: MessageRef
 ): boolean => {
-    const detectorKey = `${binaryToHex(currentMessage.publisherId)}-${currentMessage.messageChainId}`
+    const detectorKey = `${toUserId(currentMessage.publisherId)}-${currentMessage.messageChainId}`
     const previousNumberPair = previousMessageRef ?
         new NumberPair(Number(previousMessageRef.timestamp), previousMessageRef.sequenceNumber) : null
     const currentNumberPair = new NumberPair(Number(currentMessage.timestamp), currentMessage.sequenceNumber)

package/src/types.ts

@@ -0,0 +1,13 @@
+import { ChangeFieldType } from '@streamr/utils'
+import { MarkRequired } from 'ts-essentials'
+import {
+    ContentDeliveryLayerNeighborInfo as ContentDeliveryLayerNeighborInfo_,
+    NodeInfoResponse,
+    StreamPartitionInfo as StreamPartitionInfo_
+} from '../generated/packages/trackerless-network/protos/NetworkRpc'
+
+// These types are part of trackerless-network's public API. Therefore removing optionality from fields which are 
+// actually required. TODO: could do the same thing for other generated interfaces which are part of the public API.
+export type ContentDeliveryLayerNeighborInfo = MarkRequired<ContentDeliveryLayerNeighborInfo_, 'peerDescriptor'>
+export type StreamPartitionInfo = ChangeFieldType<Required<StreamPartitionInfo_>, 'contentDeliveryLayerNeighbors', ContentDeliveryLayerNeighborInfo[]>
+export type NodeInfo = ChangeFieldType<Required<NodeInfoResponse>, 'streamPartitions', StreamPartitionInfo[]>

package/test/benchmark/first-message.ts

@@ -2,7 +2,7 @@
 
 import {
     DhtNode,
-    getNodeIdFromPeerDescriptor,
+    toNodeId,
     getRandomRegion,
     LatencyType,
     PeerDescriptor,
@@ -14,6 +14,8 @@ import {
     StreamPartIDUtils,
     toStreamID,
     toStreamPartID,
+    toUserId,
+    toUserIdRaw,
     utf8ToBinary, waitForEvent3
 } from '@streamr/utils'
 import fs from 'fs'
@@ -21,7 +23,7 @@ import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNo
 import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 import { NetworkNode } from '../../src/NetworkNode'
-import { ContentType, EncryptionType, SignatureType } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { ContentType, EncryptionType, SignatureType } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor, createNetworkNodeWithSimulator } from '../utils/utils'
 
 const numNodes = 10000
@@ -75,7 +77,7 @@ const measureJoiningTime = async () => {
     const peerDescriptor = createMockPeerDescriptor({
         region: getRandomRegion()
     })
-    console.log('starting node with id ', getNodeIdFromPeerDescriptor(peerDescriptor))
+    console.log('starting node with id ', toNodeId(peerDescriptor))
 
     // start publishing ons stream
     const stream = Array.from(streamParts.keys())[Math.floor(Math.random() * streamParts.size)]
@@ -88,7 +90,7 @@ const measureJoiningTime = async () => {
                 streamPartition: 0,
                 timestamp: i,
                 sequenceNumber: Math.floor(Math.random() * 20000),
-                publisherId: hexToBinary('0x2222'),
+                publisherId: toUserIdRaw(toUserId('0x2222')),
                 messageChainId: 'msgChainId'
             },
             body: {
@@ -147,7 +149,6 @@ const run = async () => {
     await shutdownNetwork()
 } 
 
-// eslint-disable-next-line promise/catch-or-return
 run().then(() => {
     console.log('done')
 }).catch((err) => {

package/test/end-to-end/content-delivery-layer-node-with-real-connections.test.ts

@@ -1,11 +1,11 @@
 import { ConnectionManager, DhtNode, PeerDescriptor } from '@streamr/dht'
-import { randomEthereumAddress } from '@streamr/test-utils'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { ControlLayerNode } from '../../src/logic/ControlLayerNode'
 import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
+import { randomUserId } from '@streamr/test-utils'
 
 describe('content delivery layer node with real connections', () => {
 
@@ -106,10 +106,15 @@ describe('content delivery layer node with real connections', () => {
             dhtNode2.stop(),
             dhtNode3.stop(),
             dhtNode4.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode1.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode2.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode3.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode4.stop(),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             contentDeliveryLayerNode5.stop(),
             (epDhtNode.getTransport() as ConnectionManager).stop(),
             (dhtNode1.getTransport() as ConnectionManager).stop(),
@@ -120,7 +125,7 @@ describe('content delivery layer node with real connections', () => {
     })
 
     it('can fully connected topologies ', async () => {
-        await waitForCondition(() => {
+        await until(() => {
             return contentDeliveryLayerNode1.getNeighbors().length >= 3
                 && contentDeliveryLayerNode2.getNeighbors().length >= 3
                 && contentDeliveryLayerNode3.getNeighbors().length >= 3
@@ -141,7 +146,7 @@ describe('content delivery layer node with real connections', () => {
         contentDeliveryLayerNode4.on('message', () => receivedMessageCount += 1)
         contentDeliveryLayerNode5.on('message', () => receivedMessageCount += 1)
 
-        await waitForCondition(() => {
+        await until(() => {
             return contentDeliveryLayerNode1.getNeighbors().length >= 3
                 && contentDeliveryLayerNode2.getNeighbors().length >= 3
                 && contentDeliveryLayerNode3.getNeighbors().length >= 3
@@ -152,9 +157,9 @@ describe('content delivery layer node with real connections', () => {
         const msg = createStreamMessage(
             JSON.stringify({ hello: 'WORLD' }),
             streamPartId,
-            randomEthereumAddress()
+            randomUserId()
         )
         contentDeliveryLayerNode1.broadcast(msg)
-        await waitForCondition(() => receivedMessageCount >= 4)
+        await until(() => receivedMessageCount >= 4)
     })
 })

package/test/end-to-end/external-network-rpc.test.ts

@@ -1,7 +1,7 @@
 import { NetworkNode } from '../../src/NetworkNode'
 import { NetworkStack } from '../../src/NetworkStack'
-import { StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { HandshakeRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { HandshakeRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 describe('ExternalNetworkRpc', () => {

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

@@ -1,7 +1,7 @@
-import { randomEthereumAddress } from '@streamr/test-utils'
-import { StreamPartIDUtils, hexToBinary, utf8ToBinary, waitForCondition } from '@streamr/utils'
+import { randomUserId } from '@streamr/test-utils'
+import { StreamPartIDUtils, hexToBinary, toUserIdRaw, utf8ToBinary, until } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
-import { ContentType, EncryptionType, SignatureType, StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { ContentType, EncryptionType, SignatureType, StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
@@ -44,7 +44,7 @@ describe('inspect', () => {
             streamPartition: StreamPartIDUtils.getStreamPartition(STREAM_PART_ID),
             timestamp: 666,
             sequenceNumber: 0,
-            publisherId: hexToBinary(randomEthereumAddress()),
+            publisherId: toUserIdRaw(randomUserId()),
             messageChainId: 'msgChainId'
         },
         previousMessageRef: {
@@ -98,7 +98,7 @@ describe('inspect', () => {
         inspectedNode.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
         inspectorNode.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
 
-        await waitForCondition(() => 
+        await until(() => 
             publisherNode.stack.getContentDeliveryManager().getNeighbors(STREAM_PART_ID).length === 2 
             && inspectedNode.stack.getContentDeliveryManager().getNeighbors(STREAM_PART_ID).length === 2 
             && inspectorNode.stack.getContentDeliveryManager().getNeighbors(STREAM_PART_ID).length === 2

package/test/end-to-end/proxy-and-full-node.test.ts

@@ -1,5 +1,5 @@
-import { randomEthereumAddress } from '@streamr/test-utils'
-import { StreamPartID, StreamPartIDUtils, hexToBinary, utf8ToBinary, waitForEvent3 } from '@streamr/utils'
+import { randomUserId } from '@streamr/test-utils'
+import { StreamPartID, StreamPartIDUtils, hexToBinary, toUserIdRaw, utf8ToBinary, waitForEvent3 } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import {
     ContentType,
@@ -7,19 +7,19 @@ import {
     ProxyDirection,
     SignatureType,
     StreamMessage
-} from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 
-const PROXIED_NODE_USER_ID = randomEthereumAddress()
+const PROXIED_NODE_USER_ID = randomUserId()
 
 const createMessage = (streamPartId: StreamPartID): StreamMessage => {
-    return { 
+    return {
         messageId: {
             streamId: StreamPartIDUtils.getStreamID(streamPartId),
             streamPartition: StreamPartIDUtils.getStreamPartition(streamPartId),
             timestamp: 666,
             sequenceNumber: 0,
-            publisherId: hexToBinary(randomEthereumAddress()),
+            publisherId: toUserIdRaw(randomUserId()),
             messageChainId: 'msgChainId'
         },
         previousMessageRef: {

package/test/end-to-end/proxy-connections.test.ts

@@ -1,6 +1,6 @@
 import { DhtAddress } from '@streamr/dht'
-import { randomEthereumAddress } from '@streamr/test-utils'
-import { StreamPartIDUtils, hexToBinary, utf8ToBinary, wait, waitForCondition, waitForEvent3 } from '@streamr/utils'
+import { randomUserId } from '@streamr/test-utils'
+import { StreamPartIDUtils, hexToBinary, toUserIdRaw, utf8ToBinary, wait, until, waitForEvent3 } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { ProxyClient } from '../../src/logic/proxy/ProxyClient'
@@ -10,10 +10,10 @@ import {
     ProxyDirection,
     SignatureType,
     StreamMessage
-} from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 
-const PROXIED_NODE_USER_ID = randomEthereumAddress()
+const PROXIED_NODE_USER_ID = randomUserId()
 const STREAM_PART_ID = StreamPartIDUtils.parse('proxy-test#0')
 const MESSAGE: StreamMessage = {
     messageId: {
@@ -21,7 +21,7 @@ const MESSAGE: StreamMessage = {
         streamPartition: StreamPartIDUtils.getStreamPartition(STREAM_PART_ID),
         timestamp: 666,
         sequenceNumber: 0,
-        publisherId: hexToBinary(randomEthereumAddress()),
+        publisherId: toUserIdRaw(randomUserId()),
         messageChainId: 'msgChainId'
     },
     previousMessageRef: {
@@ -79,7 +79,6 @@ describe('Proxy connections', () => {
             }
         })
         await proxyNode1.start()
-        proxyNode1.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor1])
         proxyNode1.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
         proxyNode2 = createNetworkNode({
             layer0: {
@@ -92,7 +91,6 @@ describe('Proxy connections', () => {
             }
         })
         await proxyNode2.start()
-        proxyNode2.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor1])
         proxyNode2.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
         proxiedNode = createNetworkNode({
             layer0: {
@@ -131,7 +129,7 @@ describe('Proxy connections', () => {
         expect(hasConnectionFromProxy(proxyNode1)).toBe(true) 
         await proxiedNode.setProxies(STREAM_PART_ID, [], ProxyDirection.PUBLISH, PROXIED_NODE_USER_ID, 0)
         expect(proxiedNode.hasStreamPart(STREAM_PART_ID)).toBe(false) 
-        await waitForCondition(() => hasConnectionFromProxy(proxyNode1) === false)
+        await until(() => hasConnectionFromProxy(proxyNode1) === false)
     })
 
     it('can leave proxy subscribe connection', async () => {
@@ -140,7 +138,7 @@ describe('Proxy connections', () => {
         expect(hasConnectionFromProxy(proxyNode1)).toBe(true) 
         await proxiedNode.setProxies(STREAM_PART_ID, [], ProxyDirection.SUBSCRIBE, PROXIED_NODE_USER_ID, 0)
         expect(proxiedNode.hasStreamPart(STREAM_PART_ID)).toBe(false)
-        await waitForCondition(() => hasConnectionFromProxy(proxyNode1) === false)
+        await until(() => hasConnectionFromProxy(proxyNode1) === false)
     })
 
     it('can open multiple proxy connections', async () => {
@@ -167,7 +165,7 @@ describe('Proxy connections', () => {
         expect(hasConnectionFromProxy(proxyNode2)).toBe(true)
         await proxiedNode.setProxies(STREAM_PART_ID, [proxyNode1.getPeerDescriptor()], ProxyDirection.SUBSCRIBE, PROXIED_NODE_USER_ID)
         expect(proxiedNode.hasStreamPart(STREAM_PART_ID)).toBe(true)
-        await waitForCondition(() => hasConnectionFromProxy(proxyNode2) === false)
+        await until(() => hasConnectionFromProxy(proxyNode2) === false)
         expect(hasConnectionFromProxy(proxyNode1)).toBe(true)
     })
 
@@ -184,8 +182,8 @@ describe('Proxy connections', () => {
 
         await proxiedNode.setProxies(STREAM_PART_ID, [], ProxyDirection.SUBSCRIBE, PROXIED_NODE_USER_ID)
         expect(proxiedNode.hasStreamPart(STREAM_PART_ID)).toBe(false)
-        await waitForCondition(() => hasConnectionFromProxy(proxyNode1) === false)
-        await waitForCondition(() => hasConnectionFromProxy(proxyNode2) === false)
+        await until(() => hasConnectionFromProxy(proxyNode1) === false)
+        await until(() => hasConnectionFromProxy(proxyNode2) === false)
     })
 
     it('will reconnect if proxy node goes offline and comes back online', async () => {
@@ -197,10 +195,10 @@ describe('Proxy connections', () => {
         )
         expect(proxiedNode.hasStreamPart(STREAM_PART_ID)).toBe(true)
         await proxyNode1.leave(STREAM_PART_ID)
-        await waitForCondition(() => hasConnectionToProxy(proxyNode1.getNodeId(), ProxyDirection.SUBSCRIBE))
+        await until(() => hasConnectionToProxy(proxyNode1.getNodeId(), ProxyDirection.SUBSCRIBE))
         expect(hasConnectionFromProxy(proxyNode1)).toBe(false)
         proxyNode1.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
-        await waitForCondition(() => hasConnectionToProxy(proxyNode1.getNodeId(), ProxyDirection.SUBSCRIBE), 25000)
+        await until(() => hasConnectionToProxy(proxyNode1.getNodeId(), ProxyDirection.SUBSCRIBE), 25000)
         // TODO why wait is needed?
         await wait(100)
         expect(hasConnectionFromProxy(proxyNode1)).toBe(true)

package/test/end-to-end/proxy-key-exchange.test.ts

@@ -1,9 +1,12 @@
+import { randomUserId } from '@streamr/test-utils'
 import {
     StreamPartIDUtils,
-    hexToBinary, toEthereumAddress, waitForEvent3
+    hexToBinary,
+    toUserIdRaw,
+    waitForEvent3
 } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
-import { ProxyDirection, SignatureType, StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { ProxyDirection, SignatureType, StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('proxy-test#0')
@@ -15,8 +18,8 @@ describe('proxy group key exchange', () => {
     const publisherDescriptor = createMockPeerDescriptor()
     const subscriberDescriptor = createMockPeerDescriptor()
 
-    const publisherUserId = toEthereumAddress('0x823A026e226EB47980c88616e01E1D3305Ef8Ecb')
-    const subscriberUserId = toEthereumAddress('0x73E6183bf9b79D30533bEC7B28e982e9Af649B23')
+    const publisherUserId = randomUserId()
+    const subscriberUserId = randomUserId()
 
     let proxyNode: NetworkNode
     let publisher: NetworkNode
@@ -34,7 +37,6 @@ describe('proxy group key exchange', () => {
             }
         })
         await proxyNode.start()
-        proxyNode.setStreamPartEntryPoints(STREAM_PART_ID, [proxyNodeDescriptor])
         proxyNode.stack.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
         publisher = createNetworkNode({
             layer0: {
@@ -69,14 +71,14 @@ describe('proxy group key exchange', () => {
                 streamPartition: StreamPartIDUtils.getStreamPartition(STREAM_PART_ID),
                 timestamp: Date.now(),
                 sequenceNumber: 0,
-                publisherId: hexToBinary(subscriberUserId),
+                publisherId: toUserIdRaw(subscriberUserId),
                 messageChainId: '0'
             },
             body: {
                 oneofKind: 'groupKeyRequest' as const,
                 groupKeyRequest: {
                     requestId: 'requestId',
-                    recipientId: hexToBinary(publisherUserId),
+                    recipientId: toUserIdRaw(publisherUserId),
                     rsaPublicKey: new Uint8Array(),
                     groupKeyIds: ['mock']
                 }
@@ -101,14 +103,14 @@ describe('proxy group key exchange', () => {
                 streamPartition: StreamPartIDUtils.getStreamPartition(STREAM_PART_ID),
                 timestamp: Date.now(),
                 sequenceNumber: 0,
-                publisherId: hexToBinary(publisherUserId),
+                publisherId: toUserIdRaw(publisherUserId),
                 messageChainId: '0'
             },
             body: {
                 oneofKind: 'groupKeyResponse' as const,
                 groupKeyResponse: {
                     requestId: 'requestId',
-                    recipientId: hexToBinary(publisherUserId),
+                    recipientId: toUserIdRaw(publisherUserId),
                     groupKeys: []
                 }
             },

package/test/end-to-end/webrtc-full-node-network.test.ts

@@ -1,9 +1,9 @@
-import { getNodeIdFromPeerDescriptor, getRandomRegion } from '@streamr/dht'
-import { randomEthereumAddress } from '@streamr/test-utils'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { toNodeId, getRandomRegion } from '@streamr/dht'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { range } from 'lodash'
 import { NetworkStack } from '../../src/NetworkStack'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
+import { randomUserId } from '@streamr/test-utils'
 
 describe('Full node network with WebRTC connections', () => {
 
@@ -32,7 +32,6 @@ describe('Full node network with WebRTC connections', () => {
             }
         })
         await entryPoint.start()
-        entryPoint.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
         entryPoint.getContentDeliveryManager().joinStreamPart(streamPartId)
 
         await Promise.all(range(NUM_OF_NODES).map(async () => {
@@ -45,7 +44,6 @@ describe('Full node network with WebRTC connections', () => {
             })
             nodes.push(node)
             await node.start()
-            node.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
             node.getContentDeliveryManager().joinStreamPart(streamPartId)
         }))
 
@@ -60,7 +58,7 @@ describe('Full node network with WebRTC connections', () => {
 
     it('happy path', async () => {
         await Promise.all(nodes.map((node) =>
-            waitForCondition(() => {
+            until(() => {
                 return node.getContentDeliveryManager().getNeighbors(streamPartId).length >= 3
             }
             , 30000)
@@ -69,17 +67,17 @@ describe('Full node network with WebRTC connections', () => {
         const successIds: string[] = []
         nodes.forEach((node) => {
             node.getContentDeliveryManager().on('newMessage', () => {
-                successIds.push(getNodeIdFromPeerDescriptor(node.getContentDeliveryManager().getPeerDescriptor()))
+                successIds.push(toNodeId(node.getContentDeliveryManager().getPeerDescriptor()))
                 receivedMessageCount += 1
             })
         })
         const msg = createStreamMessage(
             JSON.stringify({ hello: 'WORLD' }),
             streamPartId,
-            randomEthereumAddress()
+            randomUserId()
         )
         entryPoint.getContentDeliveryManager().broadcast(msg)
-        await waitForCondition(() => receivedMessageCount === NUM_OF_NODES)
+        await until(() => receivedMessageCount === NUM_OF_NODES)
     }, 120000)
 
 })

package/test/end-to-end/websocket-full-node-network.test.ts

@@ -1,13 +1,13 @@
-import { getNodeIdFromPeerDescriptor } from '@streamr/dht'
-import { randomEthereumAddress } from '@streamr/test-utils'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { toNodeId } from '@streamr/dht'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { range } from 'lodash'
 import { NetworkStack } from '../../src/NetworkStack'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
+import { randomUserId } from '@streamr/test-utils'
 
 describe('Full node network with WebSocket connections only', () => {
 
-    const NUM_OF_NODES = 20
+    const NUM_OF_NODES = 12
     const epPeerDescriptor = createMockPeerDescriptor({
         websocket: { host: '127.0.0.1', port: 15555, tls: false }
     })
@@ -29,7 +29,6 @@ describe('Full node network with WebSocket connections only', () => {
             }
         })
         await entryPoint.start()
-        entryPoint.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
         entryPoint.getContentDeliveryManager().joinStreamPart(streamPartId)
 
         await Promise.all(range(NUM_OF_NODES).map(async (i) => {
@@ -43,7 +42,6 @@ describe('Full node network with WebSocket connections only', () => {
             })
             nodes.push(node)
             await node.start()
-            node.getContentDeliveryManager().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
             node.getContentDeliveryManager().joinStreamPart(streamPartId)
         }))
 
@@ -58,7 +56,7 @@ describe('Full node network with WebSocket connections only', () => {
 
     it('happy path', async () => {
         await Promise.all(nodes.map((node) =>
-            waitForCondition(() => {
+            until(() => {
                 return node.getContentDeliveryManager().getNeighbors(streamPartId).length >= 4
             }
             , 30000)
@@ -67,7 +65,7 @@ describe('Full node network with WebSocket connections only', () => {
         const successIds: string[] = []
         nodes.forEach((node) => {
             node.getContentDeliveryManager().on('newMessage', () => {
-                successIds.push(getNodeIdFromPeerDescriptor(node.getContentDeliveryManager().getPeerDescriptor()))
+                successIds.push(toNodeId(node.getContentDeliveryManager().getPeerDescriptor()))
                 receivedMessageCount += 1
             })
         })
@@ -75,10 +73,10 @@ describe('Full node network with WebSocket connections only', () => {
         const msg = createStreamMessage(
             JSON.stringify({ hello: 'WORLD' }),
             streamPartId,
-            randomEthereumAddress()
+            randomUserId()
         )
         entryPoint.getContentDeliveryManager().broadcast(msg)
-        await waitForCondition(() => receivedMessageCount === NUM_OF_NODES)
+        await until(() => receivedMessageCount === NUM_OF_NODES)
     }, 220000)
 
 })

package/test/integration/ContentDeliveryLayerNode-Layer1Node-Latencies.test.ts

@@ -1,5 +1,5 @@
-import { DhtNode, LatencyType, PeerDescriptor, Simulator, SimulatorTransport, getNodeIdFromPeerDescriptor } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { DhtNode, LatencyType, PeerDescriptor, Simulator, SimulatorTransport, toNodeId } from '@streamr/dht'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { range } from 'lodash'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
@@ -72,8 +72,8 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
         await otherContentDeliveryLayerNodes[0].start()
         await otherDiscoveryLayerNodes[0].joinDht([entrypointDescriptor])
         await Promise.all([
-            waitForCondition(() => otherContentDeliveryLayerNodes[0].getNearbyNodeView().getIds().length === 1),
-            waitForCondition(() => otherContentDeliveryLayerNodes[0].getNeighbors().length === 1)
+            until(() => otherContentDeliveryLayerNodes[0].getNearbyNodeView().getIds().length === 1),
+            until(() => otherContentDeliveryLayerNodes[0].getNeighbors().length === 1)
         ])
         expect(otherContentDeliveryLayerNodes[0].getNearbyNodeView().getIds().length).toEqual(1)
         expect(otherContentDeliveryLayerNodes[0].getNeighbors().length).toEqual(1)
@@ -84,7 +84,7 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
         await Promise.all(range(4).map(async (i) => {
             await otherDiscoveryLayerNodes[i].joinDht([entrypointDescriptor])
         }))
-        await waitForCondition(() => range(4).every((i) => otherContentDeliveryLayerNodes[i].getNeighbors().length >= 4), 15000, 1000)
+        await until(() => range(4).every((i) => otherContentDeliveryLayerNodes[i].getNeighbors().length >= 4), 15000, 1000)
         range(4).forEach((i) => {
             expect(otherContentDeliveryLayerNodes[i].getNearbyNodeView().getIds().length).toBeGreaterThanOrEqual(4)
             expect(otherContentDeliveryLayerNodes[i].getNeighbors().length).toBeGreaterThanOrEqual(4)
@@ -98,7 +98,7 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
                 const neighbor = allNodes.find((node) => {
                     return node.getOwnNodeId() === ownNodeId
                 })
-                const neighborNodeIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
+                const neighborNodeIds = neighbor!.getNeighbors().map((n) => toNodeId(n))
                 expect(neighborNodeIds).toContain(nodeId)
             })
         })
@@ -110,22 +110,22 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
             otherDiscoveryLayerNodes[i].joinDht([entrypointDescriptor])
         }))
         await Promise.all(otherContentDeliveryLayerNodes.map((node) =>
-            waitForCondition(() => node.getNeighbors().length >= 4, 10000)
+            until(() => node.getNeighbors().length >= 4, 10000)
         ))
 
         await Promise.all(otherContentDeliveryLayerNodes.map((node) =>
-            waitForCondition(() => node.getOutgoingHandshakeCount() === 0)
+            until(() => node.getOutgoingHandshakeCount() === 0)
         ))
 
-        await waitForCondition(() => {
+        await until(() => {
             let mismatchCounter = 0
             otherContentDeliveryLayerNodes.forEach((node) => {
                 const nodeId = node.getOwnNodeId()
                 node.getNeighbors().forEach((neighbor) => {
-                    const neighborId = getNodeIdFromPeerDescriptor(neighbor)
+                    const neighborId = toNodeId(neighbor)
                     if (neighborId !== entryPointContentDeliveryLayerNode.getOwnNodeId()) {
                         const neighbor = otherContentDeliveryLayerNodes.find((n) => n.getOwnNodeId() === neighborId)
-                        const neighborNodeIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
+                        const neighborNodeIds = neighbor!.getNeighbors().map((n) => toNodeId(n))
                         if (!neighborNodeIds.includes(nodeId)) {
                             mismatchCounter += 1
                         }