@streamr/trackerless-network 100.0.0-pretestnet.0 → 100.0.0-pretestnet.3

package/test/end-to-end/random-graph-with-real-connections.test.ts

@@ -33,12 +33,12 @@ describe('random graph with real connections', () => {
     const websocketPortRange = { min: 12222, max: 12225 } 
 
     beforeEach(async () => {
-        epDhtNode = new DhtNode({ peerDescriptor: epPeerDescriptor })
+        epDhtNode = new DhtNode({ peerDescriptor: epPeerDescriptor, websocketServerEnableTls: false })
         await epDhtNode.start()
-        dhtNode1 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
-        dhtNode2 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
-        dhtNode3 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
-        dhtNode4 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor] })
+        dhtNode1 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor], websocketServerEnableTls: false })
+        dhtNode2 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor], websocketServerEnableTls: false })
+        dhtNode3 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor], websocketServerEnableTls: false })
+        dhtNode4 = new DhtNode({ websocketPortRange, entryPoints: [epPeerDescriptor], websocketServerEnableTls: false })
         await dhtNode1.start()
         await dhtNode2.start()
         await dhtNode3.start()
@@ -50,7 +50,7 @@ describe('random graph with real connections', () => {
                 layer1Node: epDhtNode,
                 transport: epDhtNode.getTransport(),
                 connectionLocker: epDhtNode.getTransport() as ConnectionManager,
-                ownPeerDescriptor: epPeerDescriptor
+                localPeerDescriptor: epPeerDescriptor
             }
         )
         randomGraphNode2 = createRandomGraphNode({
@@ -58,28 +58,28 @@ describe('random graph with real connections', () => {
             layer1Node: dhtNode1,
             transport: dhtNode1.getTransport(),
             connectionLocker: dhtNode1.getTransport() as ConnectionManager,
-            ownPeerDescriptor: dhtNode1.getPeerDescriptor()
+            localPeerDescriptor: dhtNode1.getLocalPeerDescriptor()
         })
         randomGraphNode3 = createRandomGraphNode({
             streamPartId,
             layer1Node: dhtNode2,
             transport: dhtNode2.getTransport(),
             connectionLocker: dhtNode2.getTransport() as ConnectionManager,
-            ownPeerDescriptor: dhtNode2.getPeerDescriptor()
+            localPeerDescriptor: dhtNode2.getLocalPeerDescriptor()
         })
         randomGraphNode4 = createRandomGraphNode({
             streamPartId,
             layer1Node: dhtNode3,
             transport: dhtNode3.getTransport(),
             connectionLocker: dhtNode3.getTransport() as ConnectionManager,
-            ownPeerDescriptor: dhtNode3.getPeerDescriptor()
+            localPeerDescriptor: dhtNode3.getLocalPeerDescriptor()
         })
         randomGraphNode5 = createRandomGraphNode({
             streamPartId,
             layer1Node: dhtNode4,
             transport: dhtNode4.getTransport(),
             connectionLocker: dhtNode4.getTransport() as ConnectionManager,
-            ownPeerDescriptor: dhtNode4.getPeerDescriptor()
+            localPeerDescriptor: dhtNode4.getLocalPeerDescriptor()
         })
         await epDhtNode.joinDht([epPeerDescriptor])
         await Promise.all([

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

@@ -29,7 +29,8 @@ describe('Full node network with WebRTC connections', () => {
         entryPoint = new NetworkStack({
             layer0: {
                 entryPoints: [epPeerDescriptor],
-                peerDescriptor: epPeerDescriptor
+                peerDescriptor: epPeerDescriptor,
+                websocketServerEnableTls: false
             }
         })
         await entryPoint.start()

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

@@ -26,6 +26,7 @@ describe('Full node network with WebSocket connections only', () => {
             layer0: {
                 entryPoints: [epPeerDescriptor],
                 peerDescriptor: epPeerDescriptor,
+                websocketServerEnableTls: false
             }
         })
         await entryPoint.start()
@@ -37,7 +38,8 @@ describe('Full node network with WebSocket connections only', () => {
                 layer0: {
                     entryPoints: [epPeerDescriptor],
                     websocketPortRange: { min: 15556 + i, max: 15556 + i },
-                    numberOfNodesPerKBucket: 4
+                    numberOfNodesPerKBucket: 4,
+                    websocketServerEnableTls: false
                 }
             })
             nodes.push(node)

package/test/integration/Handshakes.test.ts

@@ -87,7 +87,7 @@ describe('Handshakes', () => {
         nodeView = new NodeList(handshakerNodeId, 10)
         targetNeighbors = new NodeList(handshakerNodeId, 4)
         handshaker = new Handshaker({
-            ownPeerDescriptor: peerDescriptor2,
+            localPeerDescriptor: peerDescriptor2,
             streamPartId,
             nearbyNodeView: nodeView,
             randomNodeView: nodeView,

package/test/integration/Inspect.test.ts

@@ -82,7 +82,7 @@ describe('inspect', () => {
         }, 200)
 
         for (const node of inspectedNodes) {
-            const result = await inspectorNode.getStreamrNode().inspect(node.getLayer0Node().getPeerDescriptor(), streamPartId)
+            const result = await inspectorNode.getStreamrNode().inspect(node.getLayer0Node().getLocalPeerDescriptor(), streamPartId)
             expect(result).toEqual(true)
         }
     }, 25000)

package/test/integration/NetworkStack.test.ts

@@ -21,13 +21,15 @@ describe('NetworkStack', () => {
         stack1 = new NetworkStack({
             layer0: {
                 peerDescriptor: epDescriptor,
-                entryPoints: [epDescriptor]
+                entryPoints: [epDescriptor],
+                websocketServerEnableTls: false
             }
         })
         stack2 = new NetworkStack({
             layer0: {
                 websocketPortRange: { min: 32223, max: 32223 },
-                entryPoints: [epDescriptor]
+                entryPoints: [epDescriptor],
+                websocketServerEnableTls: false
             }
         })
 

package/test/integration/NetworkStackStoppedDuringStart.test.ts

@@ -13,13 +13,15 @@ describe('NetworkStack can be stopped during start', () => {
         entryPoint = new NetworkStack({
             layer0: {
                 peerDescriptor: epDescriptor,
-                entryPoints: [epDescriptor]
+                entryPoints: [epDescriptor],
+                websocketServerEnableTls: false
             }
         })
         node = new NetworkStack({
             layer0: {
                 peerDescriptor: createMockPeerDescriptor(),
-                entryPoints: [epDescriptor]
+                entryPoints: [epDescriptor],
+                websocketServerEnableTls: false
             }
         })
         await entryPoint.start()

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

@@ -43,14 +43,14 @@ describe('RandomGraphNode-DhtNode-Latencies', () => {
             layer1Node: layer1Nodes[i],
             transport: cms[i],
             connectionLocker: cms[i],
-            ownPeerDescriptor: peerDescriptors[i]
+            localPeerDescriptor: peerDescriptors[i]
         }))
         entryPointRandomGraphNode = createRandomGraphNode({
             streamPartId,
             layer1Node: dhtEntryPoint,
             transport: entrypointCm,
             connectionLocker: entrypointCm,
-            ownPeerDescriptor: entrypointDescriptor
+            localPeerDescriptor: entrypointDescriptor
         })
 
         await dhtEntryPoint.start()

package/test/integration/RandomGraphNode-Layer1Node.test.ts

@@ -61,7 +61,7 @@ describe('RandomGraphNode-DhtNode', () => {
             layer1Node: layer1Nodes[i],
             transport: cms[i],
             connectionLocker: cms[i],
-            ownPeerDescriptor: peerDescriptors[i],
+            localPeerDescriptor: peerDescriptors[i],
             neighborUpdateInterval: 2000
         }))
 
@@ -70,7 +70,7 @@ describe('RandomGraphNode-DhtNode', () => {
             layer1Node: dhtEntryPoint,
             transport: entrypointCm,
             connectionLocker: entrypointCm,
-            ownPeerDescriptor: entrypointDescriptor,
+            localPeerDescriptor: entrypointDescriptor,
             neighborUpdateInterval: 2000
         })
 

package/test/unit/DeliveryRpcLocal.test.ts

@@ -35,7 +35,7 @@ describe('DeliveryRpcLocal', () => {
             broadcast: mockBroadcast,
             onLeaveNotice: mockOnLeaveNotice,
             markForInspection: mockMarkForInspection,
-            ownPeerDescriptor: peerDescriptor,
+            localPeerDescriptor: peerDescriptor,
             streamPartId: StreamPartIDUtils.parse('stream#0'),
             rpcCommunicator: new ListeningRpcCommunicator('random-graph-node', new MockTransport())
         })

package/test/unit/EntrypointDiscovery.test.ts

@@ -67,7 +67,7 @@ describe('EntryPointDiscovery', () => {
         storeCalled = 0
         layer1Node = new MockLayer1Node()
         entryPointDiscoveryWithData = new EntryPointDiscovery({
-            ownPeerDescriptor: peerDescriptor,
+            localPeerDescriptor: peerDescriptor,
             streamPartId: STREAM_PART_ID,
             layer1Node,
             getEntryPointData: fakeGetEntryPointData,
@@ -76,7 +76,7 @@ describe('EntryPointDiscovery', () => {
             storeInterval: 2000
         })
         entryPointDiscoveryWithoutData = new EntryPointDiscovery({
-            ownPeerDescriptor: peerDescriptor,
+            localPeerDescriptor: peerDescriptor,
             streamPartId: STREAM_PART_ID,
             layer1Node,
             getEntryPointData: fakeEmptyGetEntryPointData,
@@ -106,7 +106,7 @@ describe('EntryPointDiscovery', () => {
         const res = await entryPointDiscoveryWithoutData.discoverEntryPointsFromDht(0)
         expect(res.entryPointsFromDht).toEqual(true)
         expect(res.discoveredEntryPoints.length).toBe(1)
-        expect(areEqualPeerDescriptors(res.discoveredEntryPoints[0], peerDescriptor)).toBe(true)  // ownPeerDescriptor
+        expect(areEqualPeerDescriptors(res.discoveredEntryPoints[0], peerDescriptor)).toBe(true)  // localPeerDescriptor
     })
 
     it('store on empty stream', async () => {

package/test/unit/HandshakeRpcLocal.test.ts

@@ -13,14 +13,14 @@ describe('HandshakeRpcLocal', () => {
 
     let rpcLocal: HandshakeRpcLocal
 
-    const ownPeerDescriptor = createMockPeerDescriptor()
+    const localPeerDescriptor = createMockPeerDescriptor()
 
     let targetNeighbors: NodeList
     let ongoingHandshakes: Set<NodeID>
     let handshakeWithInterleaving: jest.Mock
 
     beforeEach(() => {
-        targetNeighbors = new NodeList(getNodeIdFromPeerDescriptor(ownPeerDescriptor), 10)
+        targetNeighbors = new NodeList(getNodeIdFromPeerDescriptor(localPeerDescriptor), 10)
         ongoingHandshakes = new Set()
 
         handshakeWithInterleaving = jest.fn()

package/test/unit/Handshaker.test.ts

@@ -33,14 +33,15 @@ describe('Handshaker', () => {
         randomNodeView = new NodeList(nodeId, 20)
 
         handshaker = new Handshaker({
-            ownPeerDescriptor: peerDescriptor,
+            localPeerDescriptor: peerDescriptor,
             streamPartId,
             connectionLocker: mockConnectionLocker,
             targetNeighbors,
             nearbyNodeView,
             randomNodeView,
             rpcCommunicator,
-            maxNeighborCount
+            maxNeighborCount,
+            rpcRequestTimeout: 5000
         })
     })
 

package/test/unit/Inspector.test.ts

@@ -28,7 +28,7 @@ describe('Inspector', () => {
     beforeEach(() => {
         mockConnect = jest.fn(() => {})
         inspector = new Inspector({
-            ownPeerDescriptor: inspectorDescriptor,
+            localPeerDescriptor: inspectorDescriptor,
             streamPartId: StreamPartIDUtils.parse('stream#0'),
             rpcCommunicator: new ListeningRpcCommunicator('inspector', new MockTransport()),
             connectionLocker: mockConnectionLocker,

package/test/unit/NodeList.test.ts

@@ -60,7 +60,7 @@ describe('NodeList', () => {
         }
     })
 
-    afterEach(async ()=> {
+    afterEach(async () => {
         // eslint-disable-next-line @typescript-eslint/prefer-for-of
         for (let i = 0; i < mockTransports.length; i++) {
             await mockTransports[i].stop()

package/test/unit/RandomGraphNode.test.ts

@@ -35,7 +35,7 @@ describe('RandomGraphNode', () => {
             randomNodeView,
             nearbyNodeView,
             transport: new MockTransport(),
-            ownPeerDescriptor: peerDescriptor,
+            localPeerDescriptor: peerDescriptor,
             layer1Node,
             connectionLocker: mockConnectionLocker,
             handshaker: new MockHandshaker(),

package/test/utils/mock/MockLayer0Node.ts

@@ -21,7 +21,7 @@ export class MockLayer0Node extends EventEmitter implements Layer0Node {
         throw new Error('not implemented')
     }
 
-    getPeerDescriptor(): PeerDescriptor {
+    getLocalPeerDescriptor(): PeerDescriptor {
         return this.peerDescriptor
     }
 

package/test/utils/mock/Transport.ts

@@ -9,7 +9,7 @@ export class MockTransport extends EventEmitter implements ITransport {
     }
 
     // eslint-disable-next-line class-methods-use-this
-    getPeerDescriptor(): PeerDescriptor {
+    getLocalPeerDescriptor(): PeerDescriptor {
         return PeerDescriptor.create()
     }
 

package/test/utils/utils.ts

@@ -25,25 +25,27 @@ export const mockConnectionLocker: ConnectionLocker = {
 }
 
 export const createMockRandomGraphNodeAndDhtNode = async (
-    ownPeerDescriptor: PeerDescriptor,
+    localPeerDescriptor: PeerDescriptor,
     entryPointDescriptor: PeerDescriptor,
     streamPartId: StreamPartID,
     simulator: Simulator
 ): Promise<[ Layer1Node, RandomGraphNode ]> => {
-    const mockCm = new SimulatorTransport(ownPeerDescriptor, simulator)
+    const mockCm = new SimulatorTransport(localPeerDescriptor, simulator)
     await mockCm.start()
     const layer1Node = new DhtNode({
         transport: mockCm,
-        peerDescriptor: ownPeerDescriptor,
+        peerDescriptor: localPeerDescriptor,
         numberOfNodesPerKBucket: 4,
-        entryPoints: [entryPointDescriptor]
+        entryPoints: [entryPointDescriptor],
+        rpcRequestTimeout: 5000
     })
     const randomGraphNode = createRandomGraphNode({
         streamPartId,
         transport: mockCm,
         layer1Node,
         connectionLocker: mockCm,
-        ownPeerDescriptor
+        localPeerDescriptor,
+        rpcRequestTimeout: 5000
     })
     return [layer1Node, randomGraphNode]
 }
@@ -58,8 +60,8 @@ export const createStreamMessage = (
     const messageId: MessageID = {
         streamId: StreamPartIDUtils.getStreamID(streamPartId),
         streamPartition: StreamPartIDUtils.getStreamPartition(streamPartId),
-        sequenceNumber: sequenceNumber || 0,
-        timestamp: timestamp || Date.now(),
+        sequenceNumber: sequenceNumber ?? 0,
+        timestamp: timestamp ?? Date.now(),
         publisherId: hexToBinary(publisherId),
         messageChainId: 'messageChain0',
     }
@@ -87,7 +89,7 @@ export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'k
 }
 
 export const createMockDeliveryRpcRemote = (remotePeerDescriptor?: PeerDescriptor): DeliveryRpcRemote => {
-    return new DeliveryRpcRemote(createMockPeerDescriptor(), remotePeerDescriptor || createMockPeerDescriptor(), 'mock', {} as any)
+    return new DeliveryRpcRemote(createMockPeerDescriptor(), remotePeerDescriptor ?? createMockPeerDescriptor(), 'mock', {} as any)
 }
 
 export const createMockHandshakeRpcRemote = (): HandshakeRpcRemote => {