@streamr/trackerless-network 100.0.0-testnet-one.4 → 100.0.0-testnet-two.1

package/test/unit/RandomGraphNode.test.ts

@@ -38,10 +38,12 @@ describe('RandomGraphNode', () => {
             localPeerDescriptor: peerDescriptor,
             layer1Node,
             connectionLocker: mockConnectionLocker,
-            handshaker: new MockHandshaker(),
-            neighborUpdateManager: new MockNeighborUpdateManager(),
-            neighborFinder: new MockNeighborFinder(),
-            streamPartId: StreamPartIDUtils.parse('stream#0')
+            handshaker: new MockHandshaker() as any,
+            neighborUpdateManager: new MockNeighborUpdateManager() as any,
+            neighborFinder: new MockNeighborFinder() as any,
+            streamPartId: StreamPartIDUtils.parse('stream#0'),
+            isLocalNodeEntryPoint: () => false
+
         })
         await randomGraphNode.start()
     })

package/test/utils/mock/MockHandshaker.ts

@@ -1,7 +1,8 @@
+import { Methods } from '@streamr/test-utils'
 import { NodeID } from '../../../src/identifiers'
-import { IHandshaker } from '../../../src/logic/neighbor-discovery/Handshaker'
+import { Handshaker } from '../../../src/logic/neighbor-discovery/Handshaker'
 
-export class MockHandshaker implements IHandshaker {
+export class MockHandshaker implements Methods<Handshaker> {
 
     // eslint-disable-next-line class-methods-use-this
     getOngoingHandshakes(): Set<NodeID> {

package/test/utils/mock/MockNeighborFinder.ts

@@ -1,6 +1,7 @@
-import { INeighborFinder } from '../../../src/logic/neighbor-discovery/NeighborFinder'
+import { Methods } from '@streamr/test-utils'
+import { NeighborFinder } from '../../../src/logic/neighbor-discovery/NeighborFinder'
 
-export class MockNeighborFinder implements INeighborFinder {
+export class MockNeighborFinder implements Methods<NeighborFinder> {
 
     // eslint-disable-next-line class-methods-use-this
     start(): void {

package/test/utils/mock/MockNeighborUpdateManager.ts

@@ -1,7 +1,8 @@
-import { INeighborUpdateManager } from '../../../src/logic/neighbor-discovery/NeighborUpdateManager'
+import { Methods } from '@streamr/test-utils'
+import { NeighborUpdateManager } from '../../../src/logic/neighbor-discovery/NeighborUpdateManager'
 import { NeighborUpdate } from '../../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 
-export class MockNeighborUpdateManager implements INeighborUpdateManager {
+export class MockNeighborUpdateManager implements Methods<NeighborUpdateManager> {
 
     // eslint-disable-next-line class-methods-use-this
     async start(): Promise<void> {

package/test/utils/utils.ts

@@ -16,6 +16,8 @@ import { EthereumAddress, hexToBinary, utf8ToBinary } from '@streamr/utils'
 import { StreamPartID, StreamPartIDUtils } from '@streamr/protocol'
 import { NodeID } from '../../src/identifiers'
 import { Layer1Node } from '../../src/logic/Layer1Node'
+import { DeliveryRpcClient, HandshakeRpcClient } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc.client'
+import { RpcCommunicator } from '@streamr/proto-rpc'
 
 export const mockConnectionLocker: ConnectionLocker = {
     lockConnection: () => {},
@@ -45,7 +47,8 @@ export const createMockRandomGraphNodeAndDhtNode = async (
         layer1Node,
         connectionLocker: mockCm,
         localPeerDescriptor,
-        rpcRequestTimeout: 5000
+        rpcRequestTimeout: 5000,
+        isLocalNodeEntryPoint: () => false
     })
     return [layer1Node, randomGraphNode]
 }
@@ -90,7 +93,13 @@ export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'n
 }
 
 export const createMockDeliveryRpcRemote = (remotePeerDescriptor?: PeerDescriptor): DeliveryRpcRemote => {
-    return new DeliveryRpcRemote(createMockPeerDescriptor(), remotePeerDescriptor ?? createMockPeerDescriptor(), 'mock', {} as any)
+    return new DeliveryRpcRemote(
+        createMockPeerDescriptor(),
+        remotePeerDescriptor ?? createMockPeerDescriptor(),
+        'mock',
+        new RpcCommunicator(),
+        DeliveryRpcClient
+    )
 }
 
 export const createMockHandshakeRpcRemote = (): HandshakeRpcRemote => {
@@ -98,19 +107,18 @@ export const createMockHandshakeRpcRemote = (): HandshakeRpcRemote => {
         createMockPeerDescriptor(),
         createMockPeerDescriptor(), 
         'mock',
-        {
-            handshake: async () => {},
-            interleaveNotice: async () => {}
-        } as any
+        new RpcCommunicator(),
+        HandshakeRpcClient
     )
 }
 
-export const createNetworkNodeWithSimulator = (
+export const createNetworkNodeWithSimulator = async (
     peerDescriptor: PeerDescriptor,
     simulator: Simulator,
     entryPoints: PeerDescriptor[]
-): NetworkNode => {
+): Promise<NetworkNode> => {
     const transport = new SimulatorTransport(peerDescriptor, simulator)
+    await transport.start()
     return createNetworkNode({
         layer0: {
             peerDescriptor,