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

package/test/integration/NetworkRpc.test.ts

@@ -4,11 +4,11 @@ import {
     RpcCommunicator,
     toProtoRpcClient
 } from '@streamr/proto-rpc'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
-import { Empty } from '../../src/proto/google/protobuf/empty'
-import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
-import { StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { StreamPartIDUtils, until } from '@streamr/utils'
+import { Empty } from '../../generated/google/protobuf/empty'
+import { RpcMessage } from '../../generated/packages/proto-rpc/protos/ProtoRpc'
+import { StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { createStreamMessage } from '../utils/utils'
 import { randomUserId } from '@streamr/test-utils'
 
@@ -47,6 +47,6 @@ describe('Network RPC', () => {
             randomUserId()
         )
         await client.sendStreamMessage(msg)
-        await waitForCondition(() => recvCounter === 1)
+        await until(() => recvCounter === 1)
     })
 })

package/test/integration/NetworkStack.test.ts

@@ -1,6 +1,6 @@
 import {
     StreamPartIDUtils,
-    waitForCondition
+    until
 } from '@streamr/utils'
 import { NetworkStack } from '../../src/NetworkStack'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
@@ -58,7 +58,7 @@ describe('NetworkStack', () => {
             randomUserId()
         )
         stack2.getContentDeliveryManager().broadcast(msg)
-        await waitForCondition(() => receivedMessages === 1)
+        await until(() => receivedMessages === 1)
     })
 
     it('join and wait for neighbors', async () => {

package/test/integration/NodeInfoRpc.test.ts

@@ -1,5 +1,5 @@
 import { ListeningRpcCommunicator, PeerDescriptor, Simulator, SimulatorTransport } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { NetworkStack } from '../../src/NetworkStack'
 import { NodeInfoClient } from '../../src/logic/node-info/NodeInfoClient'
 import { NODE_INFO_RPC_SERVICE_ID } from '../../src/logic/node-info/NodeInfoRpcLocal'
@@ -72,7 +72,7 @@ describe('NetworkStack NodeInfoRpc', () => {
         otherStack.getContentDeliveryManager().joinStreamPart(streamPartId1)
         requesteStack.getContentDeliveryManager().joinStreamPart(streamPartId2)
         otherStack.getContentDeliveryManager().joinStreamPart(streamPartId2)
-        await waitForCondition(() => 
+        await until(() => 
             requesteStack.getContentDeliveryManager().getNeighbors(streamPartId1).length === 1 
             && otherStack.getContentDeliveryManager().getNeighbors(streamPartId1).length === 1
             && requesteStack.getContentDeliveryManager().getNeighbors(streamPartId2).length === 1
@@ -101,7 +101,7 @@ describe('NetworkStack NodeInfoRpc', () => {
                     }]
                 }
             ],
-            version: expect.any(String)
+            applicationVersion: expect.any(String)
         })
         expect(result.streamPartitions.length).toEqual(2)
     })

package/test/integration/Propagation.test.ts

@@ -1,5 +1,5 @@
 import { Simulator } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { range } from 'lodash'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
@@ -56,10 +56,10 @@ describe('Propagation', () => {
     })
 
     it('All nodes receive messages', async () => {
-        await waitForCondition(
+        await until(
             () => contentDeliveryLayerNodes.every((node) => node.getNeighbors().length >= 3), 30000
         )
-        await waitForCondition(() => {
+        await until(() => {
             const avg = contentDeliveryLayerNodes.reduce((acc, curr) => {
                 return acc + curr.getNeighbors().length
             }, 0) / contentDeliveryLayerNodes.length
@@ -71,6 +71,6 @@ describe('Propagation', () => {
             randomUserId()
         )
         contentDeliveryLayerNodes[0].broadcast(msg)
-        await waitForCondition(() => totalReceived >= NUM_OF_NODES, 10000)
+        await until(() => totalReceived >= NUM_OF_NODES, 10000)
     }, 45000)
 })

package/test/integration/joining-streams-on-offline-peers.test.ts

@@ -1,8 +1,8 @@
 import { LatencyType, PeerDescriptor, Simulator, SimulatorTransport } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { NetworkStack } from '../../src/NetworkStack'
 import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
-import { Any } from '../../src/proto/google/protobuf/any'
+import { Any } from '../../generated/google/protobuf/any'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
 import { randomUserId } from '@streamr/test-utils'
 
@@ -76,7 +76,7 @@ describe('Joining stream parts on offline nodes', () => {
         node1.getContentDeliveryManager().on('newMessage', () => { messageReceived = true })
         const msg = createStreamMessage(JSON.stringify({ hello: 'WORLD' }), STREAM_PART_ID, randomUserId())
         node2.getContentDeliveryManager().broadcast(msg)
-        await waitForCondition(() => messageReceived, 40000)
+        await until(() => messageReceived, 40000)
     }, 60000)
 
 })

package/test/integration/stream-without-default-entrypoints.test.ts

@@ -1,11 +1,11 @@
 import { LatencyType, PeerDescriptor, Simulator, SimulatorTransport } from '@streamr/dht'
-import { StreamPartIDUtils, hexToBinary, utf8ToBinary, waitForCondition } from '@streamr/utils'
+import { randomUserId } from '@streamr/test-utils'
+import { StreamPartIDUtils, hexToBinary, toUserIdRaw, utf8ToBinary, until } from '@streamr/utils'
 import { range } from 'lodash'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
-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'
-import { randomUserId } from '@streamr/test-utils'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('test#0')
 
@@ -22,7 +22,7 @@ describe('stream without default entrypoints', () => {
             streamPartition: StreamPartIDUtils.getStreamPartition(STREAM_PART_ID),
             timestamp: 666,
             sequenceNumber: 0,
-            publisherId: hexToBinary(randomUserId()),
+            publisherId: toUserIdRaw(randomUserId()),
             messageChainId: 'msgChainId'
         },
         previousMessageRef: {
@@ -86,7 +86,7 @@ describe('stream without default entrypoints', () => {
             receivedMessageCount += 1
         })
         await Promise.all([
-            waitForCondition(() => receivedMessageCount === 1, 10000),
+            until(() => receivedMessageCount === 1, 10000),
             nodes[1].broadcast(streamMessage)
         ])
     })
@@ -96,7 +96,7 @@ describe('stream without default entrypoints', () => {
             receivedMessageCount += 1
         })
         await Promise.all([
-            waitForCondition(() => receivedMessageCount === 1, 15000),
+            until(() => receivedMessageCount === 1, 15000),
             nodes[0].join(STREAM_PART_ID),
             nodes[1].broadcast(streamMessage),
         ])
@@ -112,14 +112,14 @@ describe('stream without default entrypoints', () => {
         }))
         const nonjoinedNode = nodes[subscriberCount]
         await nonjoinedNode.broadcast(streamMessage)
-        await waitForCondition(() => receivedMessageCount === subscriberCount, 15000)
+        await until(() => receivedMessageCount === subscriberCount, 15000)
     }, 45000)
 
     it('nodes store themselves as entrypoints on streamPart if number of entrypoints is low', async () => {
         for (let i = 0; i < 10; i++) {
             await nodes[i].join(STREAM_PART_ID, { minCount: (i > 0) ? 1 : 0, timeout: 15000 })
         }
-        await waitForCondition(async () => {
+        await until(async () => {
             const entryPointData = await nodes[15].stack.getControlLayerNode().fetchDataFromDht(streamPartIdToDataKey(STREAM_PART_ID))
             return entryPointData.length >= 7
         }, 15000)

package/test/integration/streamEntryPointReplacing.test.ts

@@ -1,5 +1,5 @@
 import { LatencyType, Simulator, SimulatorTransport } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { range } from 'lodash'
 import { NetworkStack } from '../../src/NetworkStack'
 import { MAX_NODE_COUNT } from '../../src/logic/PeerDescriptorStoreManager'
@@ -82,7 +82,7 @@ describe('Stream Entry Points are replaced when known entry points leave streams
         }
 
         await Promise.all(initialNodesOnStream.map((node) => node.getContentDeliveryManager().leaveStreamPart(STREAM_PART_ID)))
-        await waitForCondition(() => 
+        await until(() => 
             laterNodesOnStream.every((node) => node.getContentDeliveryManager().getNeighbors(STREAM_PART_ID).length >= 4), 60000, 1000
         )
 
@@ -92,6 +92,6 @@ describe('Stream Entry Points are replaced when known entry points leave streams
             randomUserId()
         )
         newNodeInStream.getContentDeliveryManager().broadcast(msg)
-        await waitForCondition(() => receivedMessages === NUM_OF_LATER_NODES, 30000)
+        await until(() => receivedMessages === NUM_OF_LATER_NODES, 30000)
     }, 200000)
 })

package/test/types/global.d.ts

@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-unresolved
 import '@streamr/test-utils/customMatcherTypes'

package/test/unit/ContentDeliveryLayerNode.test.ts

@@ -1,5 +1,5 @@
 import { toNodeId } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { NodeList } from '../../src/logic/NodeList'
 import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
@@ -69,7 +69,7 @@ describe('ContentDeliveryLayerNode', () => {
         const peerDescriptor2 = createMockPeerDescriptor()
         discoveryLayerNode.setClosestContacts([peerDescriptor1, peerDescriptor2])
         discoveryLayerNode.emit('nearbyContactAdded', peerDescriptor1)
-        await waitForCondition(() => nearbyNodeView.size() === 2)
+        await until(() => nearbyNodeView.size() === 2)
         expect(nearbyNodeView.get(toNodeId(peerDescriptor1))).toBeTruthy()
         expect(nearbyNodeView.get(toNodeId(peerDescriptor2))).toBeTruthy()
     })
@@ -79,7 +79,7 @@ describe('ContentDeliveryLayerNode', () => {
         const peerDescriptor2 = createMockPeerDescriptor()
         discoveryLayerNode.setRandomContacts([peerDescriptor1, peerDescriptor2])
         discoveryLayerNode.emit('randomContactAdded', peerDescriptor1)
-        await waitForCondition(() => randomNodeView.size() === 2)
+        await until(() => randomNodeView.size() === 2)
         expect(randomNodeView.get(toNodeId(peerDescriptor1))).toBeTruthy()
         expect(randomNodeView.get(toNodeId(peerDescriptor2))).toBeTruthy()
     })
@@ -90,7 +90,7 @@ describe('ContentDeliveryLayerNode', () => {
         discoveryLayerNode.addNewRandomPeerToKBucket()
         discoveryLayerNode.setClosestContacts([peerDescriptor1, peerDescriptor2])
         discoveryLayerNode.emit('nearbyContactAdded', peerDescriptor1)
-        await waitForCondition(() => {
+        await until(() => {
             return nearbyNodeView.size() === 3
         }, 20000)
         expect(nearbyNodeView.get(toNodeId(peerDescriptor1))).toBeTruthy()

package/test/unit/ContentDeliveryManager.test.ts

@@ -1,7 +1,7 @@
 import { areEqualPeerDescriptors } from '@streamr/dht'
-import { StreamPartIDUtils, waitForCondition } from '@streamr/utils'
+import { StreamPartIDUtils, until } from '@streamr/utils'
 import { ContentDeliveryManager } from '../../src/logic/ContentDeliveryManager'
-import { ProxyDirection } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { ProxyDirection } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { MockControlLayerNode } from '../utils/mock/MockControlLayerNode'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, createStreamMessage, mockConnectionLocker } from '../utils/utils'
@@ -23,7 +23,8 @@ describe('ContentDeliveryManager', () => {
     })
 
     it('PeerDescriptor is correct', () => {
-        expect(areEqualPeerDescriptors(peerDescriptor, manager.getPeerDescriptor()))
+        // TODO could use toEqualPeerDescriptor from dht package if we export that custom matcher
+        expect(areEqualPeerDescriptors(peerDescriptor, manager.getPeerDescriptor())).toBe(true)
     })
 
     describe('join and leave', () => {
@@ -53,7 +54,7 @@ describe('ContentDeliveryManager', () => {
 
         it('broadcast joins stream', async () => {
             manager.broadcast(message)
-            await waitForCondition(() => manager.hasStreamPart(streamPartId))
+            await until(() => manager.hasStreamPart(streamPartId))
         })
     })
 

package/test/unit/ContentDeliveryRpcLocal.test.ts

@@ -1,7 +1,7 @@
 import { ListeningRpcCommunicator } from '@streamr/dht'
 import { StreamPartIDUtils } from '@streamr/utils'
 import { ContentDeliveryRpcLocal } from '../../src/logic/ContentDeliveryRpcLocal'
-import { LeaveStreamPartNotice } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { LeaveStreamPartNotice } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
 import { randomUserId } from '@streamr/test-utils'

package/test/unit/DuplicateMessageDetector.test.ts

@@ -60,10 +60,10 @@ describe('gap handling', () => {
     })
 
     test('gap division', () => {
-        expect(detector.markAndCheck(new NumberPair(15, 0), new NumberPair(18, 0)))
+        expect(detector.markAndCheck(new NumberPair(15, 0), new NumberPair(18, 0))).toEqual(true)
         expect(detector.toString()).toEqual('(10|0, 15|0], (18|0, 20|0], (40|0, 80|10], (100|0, Infinity|Infinity]')
 
-        expect(detector.markAndCheck(new NumberPair(60, 0), new NumberPair(79, 5)))
+        expect(detector.markAndCheck(new NumberPair(60, 0), new NumberPair(79, 5))).toEqual(true)
         expect(detector.toString()).toEqual('(10|0, 15|0], (18|0, 20|0], (40|0, 60|0], (79|5, 80|10], (100|0, Infinity|Infinity]')
     })
 
@@ -84,10 +84,10 @@ describe('gap handling', () => {
     })
 
     test('full contraction', () => {
-        expect(detector.markAndCheck(new NumberPair(40, 0), new NumberPair(80, 10)))
+        expect(detector.markAndCheck(new NumberPair(40, 0), new NumberPair(80, 10))).toEqual(true)
         expect(detector.toString()).toEqual('(10|0, 20|0], (100|0, Infinity|Infinity]')
 
-        expect(detector.markAndCheck(new NumberPair(10, 0), new NumberPair(20, 0)))
+        expect(detector.markAndCheck(new NumberPair(10, 0), new NumberPair(20, 0))).toEqual(true)
         expect(detector.toString()).toEqual('(100|0, Infinity|Infinity]')
     })
 })
@@ -153,28 +153,28 @@ describe('erroneous messages that overlap gaps', () => {
     })
 
     it('completely around gap', () => {
-        expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(30, 0))).toThrowError(GapMisMatchError)
+        expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(30, 0))).toThrow(GapMisMatchError)
     })
 
     it('previousNumber below gap while number in gap', () => {
-        expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(15, 0))).toThrowError(GapMisMatchError)
+        expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(15, 0))).toThrow(GapMisMatchError)
     })
 
     it('previousNumber in gap while number over gap', () => {
-        expect(() => detector.markAndCheck(new NumberPair(15, 0), new NumberPair(20, 5))).toThrowError(GapMisMatchError)
+        expect(() => detector.markAndCheck(new NumberPair(15, 0), new NumberPair(20, 5))).toThrow(GapMisMatchError)
     })
 
     it('completely around multiple gaps', () => {
-        expect(() => detector.markAndCheck(new NumberPair(10, 0), new NumberPair(200, 0))).toThrowError(GapMisMatchError)
+        expect(() => detector.markAndCheck(new NumberPair(10, 0), new NumberPair(200, 0))).toThrow(GapMisMatchError)
     })
 })
 
 test('checks that number > previousNumber', () => {
     const detector = new DuplicateMessageDetector()
     expect(() => detector.markAndCheck(new NumberPair(5, 0), new NumberPair(1, 0)))
-        .toThrowError(InvalidNumberingError)
+        .toThrow(InvalidNumberingError)
     expect(() => detector.markAndCheck(new NumberPair(5, 5), new NumberPair(5, 5)))
-        .toThrowError(InvalidNumberingError)
+        .toThrow(InvalidNumberingError)
 })
 
 test('lowest gaps get dropped when reaching maximum number of gaps', () => {

package/test/unit/ExternalNetworkRpc.test.ts

@@ -1,10 +1,10 @@
 import { Message } from '@streamr/dht'
 import { ExternalNetworkRpc, SERVICE_ID } from '../../src/logic/ExternalNetworkRpc'
-import { HandshakeRequest, HandshakeResponse } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { HandshakeRequest, HandshakeResponse } from '../../generated/packages/dht/protos/DhtRpc'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { RpcMessage } from '@streamr/proto-rpc'
-import { Any } from '../../src/proto/google/protobuf/any'
-import { HandshakeRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { Any } from '../../generated/google/protobuf/any'
+import { HandshakeRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 describe('ExternalNetworkRpc', () => {
 

package/test/unit/HandshakeRpcLocal.test.ts

@@ -2,7 +2,7 @@ import { DhtAddress, NodeType, toNodeId, toDhtAddressRaw } from '@streamr/dht'
 import { StreamPartIDUtils } from '@streamr/utils'
 import { NodeList } from '../../src/logic/NodeList'
 import { HandshakeRpcLocal } from '../../src/logic/neighbor-discovery/HandshakeRpcLocal'
-import { InterleaveRequest, StreamPartHandshakeRequest } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { InterleaveRequest, StreamPartHandshakeRequest } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createMockContentDeliveryRpcRemote, createMockHandshakeRpcRemote, createMockPeerDescriptor } from '../utils/utils'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
@@ -96,19 +96,6 @@ describe('HandshakeRpcLocal', () => {
         expect(handshakeWithInterleaving).toHaveBeenCalledTimes(1)
     })
 
-    it('handshakeWithInterleaving success', async () => {
-        const req: InterleaveRequest = {
-            interleaveTargetDescriptor: {
-                nodeId: toDhtAddressRaw('0x2222' as DhtAddress),
-                type: NodeType.NODEJS
-            }
-        }
-        await rpcLocal.interleaveRequest(req, {
-            incomingSourceDescriptor: createMockPeerDescriptor()
-        } as any)
-        expect(handshakeWithInterleaving).toHaveBeenCalledTimes(1)
-    })
-
     it('rejects handshakes if interleaving to the requestor is ongoing', async () => {
         neighbors.add(createMockContentDeliveryRpcRemote())
         neighbors.add(createMockContentDeliveryRpcRemote())

package/test/unit/InspectSession.test.ts

@@ -1,5 +1,5 @@
 import { InspectSession, Events } from '../../src/logic/inspect/InspectSession'
-import { MessageID } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { MessageID } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { waitForEvent3 } from '../../../utils/dist/src/waitForEvent3'
 import { utf8ToBinary } from '@streamr/utils'
 import { DhtAddress, randomDhtAddress } from '@streamr/dht'
@@ -52,6 +52,7 @@ describe('InspectSession', () => {
         inspectSession.markMessage(anotherNode, messageId1)
         await Promise.all([
             waitForEvent3<Events>(inspectSession, 'done', 100),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             inspectSession.markMessage(inspectedNode, messageId1)
         ])
         expect(inspectSession.getInspectedMessageCount()).toBe(1)
@@ -61,6 +62,7 @@ describe('InspectSession', () => {
         inspectSession.markMessage(inspectedNode, messageId1)
         await Promise.all([
             waitForEvent3<Events>(inspectSession, 'done', 100),
+            // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
             inspectSession.markMessage(anotherNode, messageId1)
         ])
         expect(inspectSession.getInspectedMessageCount()).toBe(1)
@@ -71,6 +73,7 @@ describe('InspectSession', () => {
         await expect(async () => {
             await Promise.all([
                 waitForEvent3<Events>(inspectSession, 'done', 100),
+                // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
                 inspectSession.markMessage(anotherNode, messageId2)
             ])
         }).rejects.toThrow('waitForEvent3')

package/test/unit/Inspector.test.ts

@@ -45,7 +45,7 @@ describe('Inspector', () => {
         }, 250)
         await inspector.inspect(inspectedDescriptor)
         expect(inspector.isInspected(toNodeId(inspectedDescriptor))).toBe(false)
-        expect(mockConnect).toBeCalledTimes(1)
+        expect(mockConnect).toHaveBeenCalledTimes(1)
     })
 
 })

package/test/unit/NeighborFinder.test.ts

@@ -1,6 +1,6 @@
 import { NeighborFinder } from '../../src/logic/neighbor-discovery/NeighborFinder'
 import { NodeList } from '../../src/logic/NodeList'
-import { waitForCondition } from '@streamr/utils'
+import { until } from '@streamr/utils'
 import { range } from 'lodash'
 import { expect } from 'expect'
 import { createMockContentDeliveryRpcRemote } from '../utils/utils'
@@ -45,7 +45,7 @@ describe('NeighborFinder', () => {
 
     it('Finds target number of nodes', async () => {
         neighborFinder.start()
-        await waitForCondition(() => neighbors.size() >= minCount, 10000)
+        await until(() => neighbors.size() >= minCount, 10000)
         expect(neighborFinder.isRunning()).toEqual(false)
     })
 })

package/test/unit/NeighborUpdateRpcLocal.test.ts

@@ -5,7 +5,7 @@ import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemo
 import { NodeList } from '../../src/logic/NodeList'
 import { NeighborFinder } from '../../src/logic/neighbor-discovery/NeighborFinder'
 import { NeighborUpdateRpcLocal } from '../../src/logic/neighbor-discovery/NeighborUpdateRpcLocal'
-import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockPeerDescriptor } from '../utils/utils'
 

package/test/unit/NetworkNode.test.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from 'eventemitter3'
 import { NetworkNode } from '../../src/NetworkNode'
 import { NetworkStack } from '../../src/NetworkStack'
 import { Events } from '../../src/logic/ContentDeliveryManager'
-import { StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { StreamMessage } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { createStreamMessage } from '../utils/utils'
 import { randomUserId } from '@streamr/test-utils'
 
@@ -33,10 +33,10 @@ describe('NetworkNode', () => {
         contentDeliveryManager.emit('newMessage', msg2)
         expect(onMessage.mock.calls[0][0]).toEqual(msg1)
         expect(onMessage.mock.calls[1][0]).toEqual(msg2)
-        expect(onMessage).toBeCalledTimes(2)
+        expect(onMessage).toHaveBeenCalledTimes(2)
 
         node.removeMessageListener(onMessage)
         contentDeliveryManager.emit('newMessage', createMessage(3))
-        expect(onMessage).toBeCalledTimes(2)
+        expect(onMessage).toHaveBeenCalledTimes(2)
     })
 })

package/test/unit/NodeList.test.ts

@@ -11,7 +11,7 @@ import { expect } from 'expect'
 import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
 import { NodeList } from '../../src/logic/NodeList'
 import { formStreamPartContentDeliveryServiceId } from '../../src/logic/formStreamPartDeliveryServiceId'
-import { ContentDeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { ContentDeliveryRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { MockTransport } from '../utils/mock/MockTransport'
 import { createMockContentDeliveryRpcRemote, createMockPeerDescriptor } from '../utils/utils'
 

package/test/unit/PeerDescriptorStoreManager.test.ts

@@ -1,8 +1,8 @@
 import { PeerDescriptor, areEqualPeerDescriptors, randomDhtAddress } from '@streamr/dht'
 import { wait } from '@streamr/utils'
 import { PeerDescriptorStoreManager } from '../../src/logic/PeerDescriptorStoreManager'
-import { Any } from '../../src/proto/google/protobuf/any'
-import { DataEntry } from '../../src/proto/packages/dht/protos/DhtRpc'
+import { Any } from '../../generated/google/protobuf/any'
+import { DataEntry } from '../../generated/packages/dht/protos/DhtRpc'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 const KEY = randomDhtAddress()

package/test/unit/Propagation.test.ts

@@ -1,5 +1,5 @@
 import { DhtAddress } from '@streamr/dht'
-import { hexToBinary, wait } from '@streamr/utils'
+import { hexToBinary, toUserIdRaw, wait } from '@streamr/utils'
 import { Propagation } from '../../src/logic/propagation/Propagation'
 import {
     ContentType,
@@ -7,7 +7,7 @@ import {
     MessageID,
     SignatureType,
     StreamMessage
-} from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
 import { randomUserId } from '@streamr/test-utils'
 
 const PUBLISHER_ID = randomUserId()
@@ -19,7 +19,7 @@ function makeMsg(streamId: string, partition: number, ts: number, msgNo: number)
         timestamp: ts,
         sequenceNumber: msgNo,
         messageChainId: 'msgChain',
-        publisherId: hexToBinary(PUBLISHER_ID)
+        publisherId: toUserIdRaw(PUBLISHER_ID)
     }
     return {
         messageId,
@@ -45,7 +45,7 @@ const N4 = 'n4' as DhtAddress
 const N5 = 'n5' as DhtAddress
 
 describe(Propagation, () => {
-    let getNeighbors: jest.Mock<ReadonlyArray<DhtAddress>, [string]>
+    let getNeighbors: jest.Mock<readonly DhtAddress[], [string]>
     let sendToNeighbor: jest.Mock<Promise<void>, [DhtAddress, StreamMessage]>
     let propagation: Propagation
 

package/test/unit/ProxyConnectionRpcRemote.test.ts

@@ -2,8 +2,8 @@ import { RpcCommunicator } from '@streamr/proto-rpc'
 import { randomUserId } from '@streamr/test-utils'
 import { hexToBinary } from '@streamr/utils'
 import { ProxyConnectionRpcRemote } from '../../src/logic/proxy/ProxyConnectionRpcRemote'
-import { ProxyConnectionRequest, ProxyDirection } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { ProxyConnectionRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { ProxyConnectionRequest, ProxyDirection } from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ProxyConnectionRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 describe('ProxyConnectionRpcRemote', () => {

package/test/unit/StreamPartReconnect.test.ts

@@ -2,7 +2,7 @@ import { PeerDescriptorStoreManager } from '../../src/logic/PeerDescriptorStoreM
 import { StreamPartReconnect } from '../../src/logic/StreamPartReconnect'
 import { MockDiscoveryLayerNode } from '../utils/mock/MockDiscoveryLayerNode'
 import { createFakePeerDescriptorStoreManager } from '../utils/fake/FakePeerDescriptorStoreManager'
-import { waitForCondition } from '@streamr/utils'
+import { until } from '@streamr/utils'
 
 describe('StreamPartReconnect', () => {
 
@@ -24,7 +24,7 @@ describe('StreamPartReconnect', () => {
         await streamPartReconnect.reconnect(1000)
         expect(streamPartReconnect.isRunning()).toEqual(true)
         discoveryLayerNode.addNewRandomPeerToKBucket()
-        await waitForCondition(() => streamPartReconnect.isRunning() === false)
+        await until(() => streamPartReconnect.isRunning() === false)
     })
 
 })

package/test/utils/mock/MockNeighborUpdateManager.ts

@@ -1,6 +1,6 @@
 import { Methods } from '@streamr/test-utils'
 import { NeighborUpdateManager } from '../../../src/logic/neighbor-discovery/NeighborUpdateManager'
-import { NeighborUpdate } from '../../../src/proto/packages/trackerless-network/protos/NetworkRpc'
+import { NeighborUpdate } from '../../../generated/packages/trackerless-network/protos/NetworkRpc'
 
 export class MockNeighborUpdateManager implements Methods<NeighborUpdateManager> {
 

package/test/utils/utils.ts

@@ -10,7 +10,7 @@ import {
     toDhtAddressRaw
 } from '@streamr/dht'
 import { RpcCommunicator } from '@streamr/proto-rpc'
-import { StreamPartID, StreamPartIDUtils, UserID, hexToBinary, utf8ToBinary } from '@streamr/utils'
+import { StreamPartID, StreamPartIDUtils, UserID, hexToBinary, toUserIdRaw, utf8ToBinary } from '@streamr/utils'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { ContentDeliveryRpcRemote } from '../../src/logic/ContentDeliveryRpcRemote'
@@ -23,8 +23,8 @@ import {
     MessageID,
     SignatureType,
     StreamMessage
-} from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { ContentDeliveryRpcClient, HandshakeRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+} from '../../generated/packages/trackerless-network/protos/NetworkRpc'
+import { ContentDeliveryRpcClient, HandshakeRpcClient } from '../../generated/packages/trackerless-network/protos/NetworkRpc.client'
 
 export const mockConnectionLocker: ConnectionLocker = {
     lockConnection: () => {},
@@ -50,7 +50,8 @@ export const createMockContentDeliveryLayerNodeAndDhtNode = async (
         peerDescriptor: localPeerDescriptor,
         numberOfNodesPerKBucket: 4,
         entryPoints: [entryPointDescriptor],
-        rpcRequestTimeout: 5000
+        rpcRequestTimeout: 5000,
+        neighborPingLimit: 16
     })
     const contentDeliveryLayerNode = createContentDeliveryLayerNode({
         streamPartId,
@@ -76,7 +77,7 @@ export const createStreamMessage = (
         streamPartition: StreamPartIDUtils.getStreamPartition(streamPartId),
         sequenceNumber: sequenceNumber ?? 0,
         timestamp: timestamp ?? Date.now(),
-        publisherId: hexToBinary(publisherId),
+        publisherId: toUserIdRaw(publisherId),
         messageChainId: 'messageChain0',
     }
     const msg: StreamMessage = {

package/tsconfig.browser.json

@@ -7,6 +7,7 @@
   },
   "include": [
     "src/**/*",
+    "generated/**/*",
     "test/**/*"
   ]
 }

package/tsconfig.jest.json

@@ -6,6 +6,7 @@
     },
     "include": [
         "src/**/*",
+        "generated/**/*",
         "test/**/*",
         "package.json"
     ],