@streamr/trackerless-network 0.0.1-tatum.6 → 0.0.1-tatum.8

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

@@ -10,10 +10,9 @@ describe('Full node network with WebSocket connections only', () => {
 
     const NUM_OF_NODES = 48
     const epPeerDescriptor = createMockPeerDescriptor({
-        nodeName: 'entrypoint',
         websocket: { host: '127.0.0.1', port: 15555, tls: false }
     })
-    const randomGraphId = StreamPartIDUtils.parse('websocket-network#0')
+    const streamPartId = StreamPartIDUtils.parse('websocket-network#0')
 
     let entryPoint: NetworkStack
 
@@ -30,22 +29,21 @@ describe('Full node network with WebSocket connections only', () => {
             }
         })
         await entryPoint.start()
-        entryPoint.getStreamrNode()!.setStreamPartEntryPoints(randomGraphId, [epPeerDescriptor])
-        entryPoint.getStreamrNode()!.joinStreamPart(randomGraphId)
+        entryPoint.getStreamrNode()!.setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
+        entryPoint.getStreamrNode()!.joinStreamPart(streamPartId)
 
         await Promise.all(range(NUM_OF_NODES).map(async (i) => {
             const node = new NetworkStack({
                 layer0: {
                     entryPoints: [epPeerDescriptor],
                     websocketPortRange: { min: 15556 + i, max: 15556 + i },
-                    nodeName: `${i}`,
                     numberOfNodesPerKBucket: 4
                 }
             })
             nodes.push(node)
             await node.start()
-            node.getStreamrNode().setStreamPartEntryPoints(randomGraphId, [epPeerDescriptor])
-            node.getStreamrNode().joinStreamPart(randomGraphId)
+            node.getStreamrNode().setStreamPartEntryPoints(streamPartId, [epPeerDescriptor])
+            node.getStreamrNode().joinStreamPart(streamPartId)
         }))
 
     }, 120000)
@@ -60,13 +58,13 @@ describe('Full node network with WebSocket connections only', () => {
     it('happy path', async () => {
         await Promise.all(nodes.map((node) =>
             waitForCondition(() => {
-                return node.getStreamrNode()!.getNeighbors(randomGraphId).length >= 4
+                return node.getStreamrNode()!.getNeighbors(streamPartId).length >= 4
             }
             , 120000)
         ))
         let numOfMessagesReceived = 0
         const successIds: string[] = []
-        nodes.map((node) => {
+        nodes.forEach((node) => {
             node.getStreamrNode()!.on('newMessage', () => {
                 successIds.push(getNodeIdFromPeerDescriptor(node.getStreamrNode()!.getPeerDescriptor()))
                 numOfMessagesReceived += 1
@@ -75,7 +73,7 @@ describe('Full node network with WebSocket connections only', () => {
 
         const msg = createStreamMessage(
             JSON.stringify({ hello: 'WORLD' }),
-            randomGraphId,
+            streamPartId,
             randomEthereumAddress()
         )
         entryPoint.getStreamrNode()!.broadcast(msg)

package/test/integration/{RemoteRandomGraphNode.test.ts → DeliveryRpcRemote.test.ts}

@@ -5,24 +5,25 @@ import {
     SimulatorTransport,
     NodeType
 } from '@streamr/dht'
-import { RemoteRandomGraphNode } from '../../src/logic/RemoteRandomGraphNode'
-import { NetworkRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { DeliveryRpcRemote } from '../../src/logic/DeliveryRpcRemote'
+import { DeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
 import {
     LeaveStreamPartNotice,
     StreamMessage
 } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import { Empty } from '../../src/proto/google/protobuf/empty'
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { waitForCondition } from '@streamr/utils'
 import { toProtoRpcClient } from '@streamr/proto-rpc'
 import { createStreamMessage } from '../utils/utils'
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
 
-describe('RemoteRandomGraphNode', () => {
+const STREAM_PART_ID = StreamPartIDUtils.parse('test-stream#0')
+
+describe('DeliveryRpcRemote', () => {
     let mockServerRpc: ListeningRpcCommunicator
     let clientRpc: ListeningRpcCommunicator
-    let remoteRandomGraphNode: RemoteRandomGraphNode
+    let rpcRemote: DeliveryRpcRemote
 
     const clientNode: PeerDescriptor = {
         kademliaId: new Uint8Array([1, 1, 1]),
@@ -39,11 +40,13 @@ describe('RemoteRandomGraphNode', () => {
     let mockConnectionManager1: SimulatorTransport
     let mockConnectionManager2: SimulatorTransport
 
-    beforeEach(() => {
+    beforeEach(async () => {
         recvCounter = 0
         simulator = new Simulator()
         mockConnectionManager1 = new SimulatorTransport(serverNode, simulator)
+        await mockConnectionManager1.start()
         mockConnectionManager2 = new SimulatorTransport(clientNode, simulator)
+        await mockConnectionManager2.start()
         
         mockServerRpc = new ListeningRpcCommunicator('test', mockConnectionManager1)
         clientRpc = new ListeningRpcCommunicator('test', mockConnectionManager2)
@@ -51,7 +54,7 @@ describe('RemoteRandomGraphNode', () => {
         mockServerRpc.registerRpcNotification(
             StreamMessage,
             'sendStreamMessage',
-            async (_msg: StreamMessage, _context: ServerCallContext): Promise<Empty> => {
+            async (): Promise<Empty> => {
                 recvCounter += 1
                 return Empty
             }
@@ -60,17 +63,17 @@ describe('RemoteRandomGraphNode', () => {
         mockServerRpc.registerRpcNotification(
             LeaveStreamPartNotice,
             'leaveStreamPartNotice',
-            async (_msg: LeaveStreamPartNotice, _context: ServerCallContext): Promise<Empty> => {
+            async (): Promise<Empty> => {
                 recvCounter += 1
                 return Empty
             }
         )
 
-        remoteRandomGraphNode = new RemoteRandomGraphNode(
+        rpcRemote = new DeliveryRpcRemote(
             clientNode,
             serverNode,
-            'test-stream',
-            toProtoRpcClient(new NetworkRpcClient(clientRpc.getRpcClientTransport()))
+            STREAM_PART_ID,
+            toProtoRpcClient(new DeliveryRpcClient(clientRpc.getRpcClientTransport()))
         )
     })
 
@@ -85,16 +88,16 @@ describe('RemoteRandomGraphNode', () => {
     it('sendStreamMessage', async () => {
         const msg = createStreamMessage(
             JSON.stringify({ hello: 'WORLD' }),
-            StreamPartIDUtils.parse('test-stream#0'),
+            STREAM_PART_ID,
             randomEthereumAddress()
         )
 
-        await remoteRandomGraphNode.sendStreamMessage(msg)
+        await rpcRemote.sendStreamMessage(msg)
         await waitForCondition(() => recvCounter === 1)
     })
 
     it('leaveNotice', async () => {
-        remoteRandomGraphNode.leaveStreamPartNotice()
+        rpcRemote.leaveStreamPartNotice()
         await waitForCondition(() => recvCounter === 1)
     })
 

package/test/integration/{RemoteHandshaker.test.ts → HandshakeRpcRemote.test.ts}

@@ -2,7 +2,6 @@ import {
     StreamPartHandshakeRequest,
     StreamPartHandshakeResponse
 } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import {
     ListeningRpcCommunicator,
     NodeType,
@@ -14,12 +13,12 @@ import { toProtoRpcClient } from '@streamr/proto-rpc'
 import {
     HandshakeRpcClient,
 } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
-import { RemoteHandshaker } from '../../src/logic/neighbor-discovery/RemoteHandshaker'
+import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote'
 
-describe('RemoteHandshaker', () => {
+describe('HandshakeRpcRemote', () => {
     let mockServerRpc: ListeningRpcCommunicator
     let clientRpc: ListeningRpcCommunicator
-    let remoteHandshaker: RemoteHandshaker
+    let rpcRemote: HandshakeRpcRemote
 
     const clientNode: PeerDescriptor = {
         kademliaId: new Uint8Array([1, 1, 1]),
@@ -34,11 +33,13 @@ describe('RemoteHandshaker', () => {
     let mockConnectionManager1: SimulatorTransport
     let mockConnectionManager2: SimulatorTransport
 
-    beforeEach(() => {
+    beforeEach(async () => {
         Simulator.useFakeTimers()
         simulator = new Simulator()
         mockConnectionManager1 = new SimulatorTransport(serverNode, simulator)
+        await mockConnectionManager1.start()
         mockConnectionManager2 = new SimulatorTransport(clientNode, simulator)
+        await mockConnectionManager2.start()
 
         mockServerRpc = new ListeningRpcCommunicator('test', mockConnectionManager1)
         clientRpc = new ListeningRpcCommunicator('test', mockConnectionManager2)
@@ -47,7 +48,7 @@ describe('RemoteHandshaker', () => {
             StreamPartHandshakeRequest,
             StreamPartHandshakeResponse,
             'handshake',
-            async (msg: StreamPartHandshakeRequest, _context: ServerCallContext): Promise<StreamPartHandshakeResponse> => {
+            async (msg: StreamPartHandshakeRequest): Promise<StreamPartHandshakeResponse> => {
                 const res: StreamPartHandshakeResponse = {
                     requestId: msg.requestId,
                     accepted: true
@@ -56,10 +57,10 @@ describe('RemoteHandshaker', () => {
             }
         )
 
-        remoteHandshaker = new RemoteHandshaker(
+        rpcRemote = new HandshakeRpcRemote(
             clientNode,
             serverNode,
-            'test-stream',
+            'test-stream-part',
             toProtoRpcClient(new HandshakeRpcClient(clientRpc.getRpcClientTransport()))
         )
     })
@@ -74,7 +75,7 @@ describe('RemoteHandshaker', () => {
     })
 
     it('handshake', async () => {
-        const result = await remoteHandshaker.handshake([])
+        const result = await rpcRemote.handshake([])
         expect(result.accepted).toEqual(true)
     })
 })

package/test/integration/Handshakes.test.ts

@@ -13,9 +13,9 @@ import {
 import { NodeList } from '../../src/logic/NodeList'
 import { mockConnectionLocker } from '../utils/utils'
 import { StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
-import { RemoteHandshaker } from '../../src/logic/neighbor-discovery/RemoteHandshaker'
+import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/HandshakeRpcRemote'
 import { getNodeIdFromPeerDescriptor } from '../../src/identifiers'
+import { StreamPartIDUtils } from '@streamr/protocol'
 
 describe('Handshakes', () => {
 
@@ -37,9 +37,9 @@ describe('Handshakes', () => {
     let nodeView: NodeList
     let targetNeighbors: NodeList
     let handshaker: Handshaker
-    const randomGraphId = 'handshaker'
+    const streamPartId = StreamPartIDUtils.parse('stream#0')
 
-    const acceptHandshake = async (request: StreamPartHandshakeRequest, _context: ServerCallContext): Promise<StreamPartHandshakeResponse> => {
+    const acceptHandshake = async (request: StreamPartHandshakeRequest): Promise<StreamPartHandshakeResponse> => {
         const response: StreamPartHandshakeResponse = {
             requestId: request.requestId,
             accepted: true
@@ -47,7 +47,7 @@ describe('Handshakes', () => {
         return response
     }
 
-    const rejectHandshake = async (request: StreamPartHandshakeRequest, _context: ServerCallContext): Promise<StreamPartHandshakeResponse> => {
+    const rejectHandshake = async (request: StreamPartHandshakeRequest): Promise<StreamPartHandshakeResponse> => {
         const response: StreamPartHandshakeResponse = {
             requestId: request.requestId,
             accepted: false
@@ -55,7 +55,7 @@ describe('Handshakes', () => {
         return response
     }
 
-    const interleavingHandshake = async (request: StreamPartHandshakeRequest, _context: ServerCallContext): Promise<StreamPartHandshakeResponse> => {
+    const interleavingHandshake = async (request: StreamPartHandshakeRequest): Promise<StreamPartHandshakeResponse> => {
         const response: StreamPartHandshakeResponse = {
             requestId: request.requestId,
             accepted: true,
@@ -69,29 +69,32 @@ describe('Handshakes', () => {
     let simulatorTransport2: SimulatorTransport
     let simulatorTransport3: SimulatorTransport
 
-    beforeEach(() => {
+    beforeEach(async () => {
         Simulator.useFakeTimers()
         simulator = new Simulator()
         simulatorTransport1 = new SimulatorTransport(peerDescriptor1, simulator)
+        await simulatorTransport1.start()
         simulatorTransport2 = new SimulatorTransport(peerDescriptor2, simulator)
+        await simulatorTransport2.start()
         simulatorTransport3 = new SimulatorTransport(peerDescriptor3, simulator)
+        await simulatorTransport3.start()
 
-        rpcCommunicator1 = new ListeningRpcCommunicator(randomGraphId, simulatorTransport1)
-        rpcCommunicator2 = new ListeningRpcCommunicator(randomGraphId, simulatorTransport2)
-        rpcCommunicator3 = new ListeningRpcCommunicator(randomGraphId, simulatorTransport3)
+        rpcCommunicator1 = new ListeningRpcCommunicator(streamPartId, simulatorTransport1)
+        rpcCommunicator2 = new ListeningRpcCommunicator(streamPartId, simulatorTransport2)
+        rpcCommunicator3 = new ListeningRpcCommunicator(streamPartId, simulatorTransport3)
 
         const handshakerNodeId = getNodeIdFromPeerDescriptor(peerDescriptor2)
         nodeView = new NodeList(handshakerNodeId, 10)
         targetNeighbors = new NodeList(handshakerNodeId, 4)
         handshaker = new Handshaker({
             ownPeerDescriptor: peerDescriptor2,
-            randomGraphId,
+            streamPartId,
             nearbyNodeView: nodeView,
             randomNodeView: nodeView,
             targetNeighbors,
             connectionLocker: mockConnectionLocker,
             rpcCommunicator: rpcCommunicator2,
-            N: 4
+            maxNeighborCount: 4
         })
 
     })
@@ -111,10 +114,10 @@ describe('Handshakes', () => {
         rpcCommunicator1.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', acceptHandshake)
         // @ts-expect-error private
         const res = await handshaker.handshakeWithTarget(
-            new RemoteHandshaker(
+            new HandshakeRpcRemote(
                 peerDescriptor2,
                 peerDescriptor1,
-                randomGraphId,
+                streamPartId,
                 toProtoRpcClient(new HandshakeRpcClient(rpcCommunicator2.getRpcClientTransport()))
             )
         )
@@ -126,10 +129,10 @@ describe('Handshakes', () => {
         rpcCommunicator1.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', acceptHandshake)
         // @ts-expect-error private
         const res = await handshaker.handshakeWithTarget(
-            new RemoteHandshaker(
+            new HandshakeRpcRemote(
                 peerDescriptor2,
                 peerDescriptor1,
-                randomGraphId,
+                streamPartId,
                 toProtoRpcClient(new HandshakeRpcClient(rpcCommunicator2.getRpcClientTransport()))
             )
         )
@@ -141,10 +144,10 @@ describe('Handshakes', () => {
         rpcCommunicator1.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', rejectHandshake)
         // @ts-expect-error private
         const res = await handshaker.handshakeWithTarget(
-            new RemoteHandshaker(
+            new HandshakeRpcRemote(
                 peerDescriptor2,
                 peerDescriptor1,
-                randomGraphId,
+                streamPartId,
                 toProtoRpcClient(new HandshakeRpcClient(rpcCommunicator2.getRpcClientTransport()))
             )
         )
@@ -157,10 +160,10 @@ describe('Handshakes', () => {
         rpcCommunicator3.registerRpcMethod(StreamPartHandshakeRequest, StreamPartHandshakeResponse, 'handshake', acceptHandshake)
         // @ts-expect-error private
         const res = await handshaker.handshakeWithTarget(
-            new RemoteHandshaker(
+            new HandshakeRpcRemote(
                 peerDescriptor2,
                 peerDescriptor1,
-                randomGraphId,
+                streamPartId,
                 toProtoRpcClient(new HandshakeRpcClient(rpcCommunicator2.getRpcClientTransport()))
             )
         )

package/test/integration/Inspect.test.ts

@@ -24,12 +24,13 @@ describe('inspect', () => {
     let publishInterval: NodeJS.Timeout
 
     const initiateNode = async (peerDescriptor: PeerDescriptor, simulator: Simulator): Promise<NetworkStack> => {
-        const transportLayer = new SimulatorTransport(peerDescriptor, simulator)
+        const transport = new SimulatorTransport(peerDescriptor, simulator)
+        await transport.start()
         const node = new NetworkStack({
             layer0: {
                 entryPoints: [publisherDescriptor],
                 peerDescriptor,
-                transportLayer
+                transport
             }
         })
         await node.start()
@@ -81,7 +82,7 @@ describe('inspect', () => {
         }, 200)
 
         for (const node of inspectedNodes) {
-            const result = await inspectorNode.getStreamrNode().inspect(node.getLayer0DhtNode().getPeerDescriptor(), streamPartId)
+            const result = await inspectorNode.getStreamrNode().inspect(node.getLayer0Node().getPeerDescriptor(), streamPartId)
             expect(result).toEqual(true)
         }
     }, 25000)

package/test/integration/{RemoteNeighborUpdateManager.test.ts → NeighborUpdateRpcRemote.test.ts}

@@ -1,4 +1,3 @@
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import {
     ListeningRpcCommunicator,
     NodeType,
@@ -7,16 +6,17 @@ import {
     SimulatorTransport
 } from '@streamr/dht'
 import { toProtoRpcClient } from '@streamr/proto-rpc'
-import { RemoteNeighborUpdateManager } from '../../src/logic/neighbor-discovery/RemoteNeighborUpdateManager'
+import { NeighborUpdateRpcRemote } from '../../src/logic/neighbor-discovery/NeighborUpdateRpcRemote'
 import { NeighborUpdate } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import {
     NeighborUpdateRpcClient,
 } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { StreamPartIDUtils } from '@streamr/protocol'
 
-describe('RemoteNeighborUpdateManager', () => {
+describe('NeighborUpdateRpcRemote', () => {
     let mockServerRpc: ListeningRpcCommunicator
     let clientRpc: ListeningRpcCommunicator
-    let neighborUpdateRpcClient: RemoteNeighborUpdateManager
+    let rpcRemote: NeighborUpdateRpcRemote
 
     const clientNode: PeerDescriptor = {
         kademliaId: new Uint8Array([1, 1, 1]),
@@ -31,10 +31,12 @@ describe('RemoteNeighborUpdateManager', () => {
     let mockConnectionManager1: SimulatorTransport
     let mockConnectionManager2: SimulatorTransport
 
-    beforeEach(() => {
+    beforeEach(async () => {
         simulator = new Simulator()
         mockConnectionManager1 = new SimulatorTransport(serverNode, simulator)
+        await mockConnectionManager1.start()
         mockConnectionManager2 = new SimulatorTransport(clientNode, simulator)
+        await mockConnectionManager2.start()
 
         mockServerRpc = new ListeningRpcCommunicator('test', mockConnectionManager1)
         clientRpc = new ListeningRpcCommunicator('test', mockConnectionManager2)
@@ -43,13 +45,13 @@ describe('RemoteNeighborUpdateManager', () => {
             NeighborUpdate,
             NeighborUpdate,
             'neighborUpdate',
-            async (_msg: NeighborUpdate, _context: ServerCallContext): Promise<NeighborUpdate> => {
+            async (): Promise<NeighborUpdate> => {
                 const node: PeerDescriptor = {
                     kademliaId: new Uint8Array([4, 2, 4]),
                     type: NodeType.NODEJS
                 }
                 const update: NeighborUpdate = {
-                    randomGraphId: 'testStream',
+                    streamPartId: StreamPartIDUtils.parse('stream#0'),
                     neighborDescriptors: [
                         node
                     ],
@@ -58,10 +60,10 @@ describe('RemoteNeighborUpdateManager', () => {
                 return update
             }
         )
-        neighborUpdateRpcClient = new RemoteNeighborUpdateManager(
+        rpcRemote = new NeighborUpdateRpcRemote(
             clientNode,
             serverNode,
-            'test-stream',
+            'test-stream-part',
             toProtoRpcClient(new NeighborUpdateRpcClient(clientRpc.getRpcClientTransport()))
         )
     })
@@ -75,7 +77,7 @@ describe('RemoteNeighborUpdateManager', () => {
     })
 
     it('updateNeighbors', async () => {
-        const res = await neighborUpdateRpcClient.updateNeighbors([])
+        const res = await rpcRemote.updateNeighbors([])
         expect(res.peerDescriptors.length).toEqual(1)
     })
 })

package/test/integration/NetworkNode.test.ts

@@ -1,14 +1,13 @@
-import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 import { NodeType, PeerDescriptor, Simulator, SimulatorTransport } from '@streamr/dht'
 import {
     MessageID,
     MessageRef,
     StreamMessage,
     StreamMessageType,
-    StreamPartIDUtils,
-    toStreamID
+    StreamPartIDUtils
 } from '@streamr/protocol'
-import { EthereumAddress, waitForCondition, hexToBinary, utf8ToBinary } from '@streamr/utils'
+import { EthereumAddress, hexToBinary, utf8ToBinary, waitForCondition } from '@streamr/utils'
+import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('test#0')
 
@@ -34,20 +33,22 @@ describe('NetworkNode', () => {
         Simulator.useFakeTimers()
         const simulator = new Simulator()
         transport1 = new SimulatorTransport(pd1, simulator)
+        await transport1.start()
         transport2 = new SimulatorTransport(pd2, simulator)
+        await transport2.start()
 
         node1 = createNetworkNode({
             layer0: {
                 entryPoints: [pd1],
                 peerDescriptor: pd1,
-                transportLayer: transport1
+                transport: transport1
             }
         })
         node2 = createNetworkNode({
             layer0: {
                 entryPoints: [pd1],
                 peerDescriptor: pd2,
-                transportLayer: transport2
+                transport: transport2
             }
         })
 
@@ -68,8 +69,8 @@ describe('NetworkNode', () => {
     it('wait for join + broadcast and subscribe', async () => {
         const streamMessage = new StreamMessage({
             messageId: new MessageID(
-                toStreamID('test'),
-                0,
+                StreamPartIDUtils.getStreamID(STREAM_PART_ID),
+                StreamPartIDUtils.getStreamPartition(STREAM_PART_ID),
                 666,
                 0,
                 '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' as EthereumAddress,

package/test/integration/NetworkRpc.test.ts

@@ -1,14 +1,12 @@
 import {
     RpcCommunicator,
-    ProtoCallContext,
     ProtoRpcClient,
     toProtoRpcClient
 } from '@streamr/proto-rpc'
-import { NetworkRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { DeliveryRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
 import { StreamMessage } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import { waitForCondition } from '@streamr/utils'
 import { Empty } from '../../src/proto/google/protobuf/empty'
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc'
 import { createStreamMessage } from '../utils/utils'
 import { RpcMessage } from '../../src/proto/packages/proto-rpc/protos/ProtoRpc'
 import { Simulator } from '@streamr/dht'
@@ -18,21 +16,21 @@ import { randomEthereumAddress } from '@streamr/test-utils'
 describe('Network RPC', () => {
     let rpcCommunicator1: RpcCommunicator
     let rpcCommunicator2: RpcCommunicator
-    let client: ProtoRpcClient<NetworkRpcClient>
+    let client: ProtoRpcClient<DeliveryRpcClient>
     let recvCounter = 0
 
     beforeEach(() => {
         Simulator.useFakeTimers()
         rpcCommunicator1 = new RpcCommunicator()
         rpcCommunicator2 = new RpcCommunicator()
-        rpcCommunicator1.on('outgoingMessage', (message: RpcMessage, _requestId: string, _ucallContext?: ProtoCallContext) => {
+        rpcCommunicator1.on('outgoingMessage', (message: RpcMessage) => {
             rpcCommunicator2.handleIncomingMessage(message)
         })
-        client = toProtoRpcClient(new NetworkRpcClient(rpcCommunicator1.getRpcClientTransport()))
+        client = toProtoRpcClient(new DeliveryRpcClient(rpcCommunicator1.getRpcClientTransport()))
         rpcCommunicator2.registerRpcNotification(
             StreamMessage,
             'sendStreamMessage',
-            async (_msg: StreamMessage, _context: ServerCallContext): Promise<Empty> => {
+            async (): Promise<Empty> => {
                 recvCounter += 1
                 return {}
             }

package/test/integration/NetworkStack.test.ts

@@ -6,37 +6,35 @@ import { waitForCondition } from '@streamr/utils'
 import { NetworkStack } from '../../src/NetworkStack'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
 
+const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
+
 describe('NetworkStack', () => {
 
     let stack1: NetworkStack
     let stack2: NetworkStack
-    const streamPartId = StreamPartIDUtils.parse('stream1#0')
 
     const epDescriptor = createMockPeerDescriptor({
-        websocket: { host: '127.0.0.1', port: 32222, tls: false },
-        nodeName: 'entrypoint'
+        websocket: { host: '127.0.0.1', port: 32222, tls: false }
     })
 
     beforeEach(async () => {
         stack1 = new NetworkStack({
             layer0: {
                 peerDescriptor: epDescriptor,
-                entryPoints: [epDescriptor],
-                nodeName: 'entrypoint'
+                entryPoints: [epDescriptor]
             }
         })
         stack2 = new NetworkStack({
             layer0: {
                 websocketPortRange: { min: 32223, max: 32223 },
-                entryPoints: [epDescriptor],
-                nodeName: 'node2'
+                entryPoints: [epDescriptor]
             }
         })
 
         await stack1.start()
-        stack1.getStreamrNode()!.setStreamPartEntryPoints(streamPartId, [epDescriptor])
+        stack1.getStreamrNode()!.setStreamPartEntryPoints(STREAM_PART_ID, [epDescriptor])
         await stack2.start()
-        stack2.getStreamrNode()!.setStreamPartEntryPoints(streamPartId, [epDescriptor])
+        stack2.getStreamrNode()!.setStreamPartEntryPoints(STREAM_PART_ID, [epDescriptor])
     })
 
     afterEach(async () => {
@@ -48,13 +46,13 @@ describe('NetworkStack', () => {
 
     it('Can use NetworkNode pub/sub via NetworkStack', async () => {
         let receivedMessages = 0
-        stack1.getStreamrNode().joinStreamPart(streamPartId)
+        stack1.getStreamrNode().joinStreamPart(STREAM_PART_ID)
         stack1.getStreamrNode().on('newMessage', () => {
             receivedMessages += 1
         })
         const msg = createStreamMessage(
             JSON.stringify({ hello: 'WORLD' }),
-            streamPartId,
+            STREAM_PART_ID,
             randomEthereumAddress()
         )
         stack2.getStreamrNode().broadcast(msg)
@@ -63,10 +61,10 @@ describe('NetworkStack', () => {
 
     it('join and wait for neighbors', async () => {
         await Promise.all([
-            stack1.joinStreamPart(streamPartId, { minCount: 1, timeout: 5000 }),
-            stack2.joinStreamPart(streamPartId, { minCount: 1, timeout: 5000 }),
+            stack1.joinStreamPart(STREAM_PART_ID, { minCount: 1, timeout: 5000 }),
+            stack2.joinStreamPart(STREAM_PART_ID, { minCount: 1, timeout: 5000 }),
         ])
-        expect(stack1.getStreamrNode().getNeighbors(streamPartId).length).toBe(1)
-        expect(stack2.getStreamrNode().getNeighbors(streamPartId).length).toBe(1)
+        expect(stack1.getStreamrNode().getNeighbors(STREAM_PART_ID).length).toBe(1)
+        expect(stack2.getStreamrNode().getNeighbors(STREAM_PART_ID).length).toBe(1)
     })
 })