@streamr/trackerless-network 100.2.5-beta.1 → 101.0.0-beta.1

package/src/proto/packages/trackerless-network/protos/NetworkRpc.ts

@@ -1,4 +1,4 @@
-// @generated by protobuf-ts 2.9.3 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/trackerless-network/protos/NetworkRpc.proto" (syntax proto3)
 // tslint:disable
 import { Empty } from "../../../google/protobuf/empty";
@@ -183,17 +183,17 @@ export interface StreamPartHandshakeRequest {
      */
     requestId: string;
     /**
-     * @generated from protobuf field: optional bytes concurrentHandshakeTargetId = 3;
+     * @generated from protobuf field: optional bytes concurrentHandshakeNodeId = 3;
      */
-    concurrentHandshakeTargetId?: Uint8Array;
+    concurrentHandshakeNodeId?: Uint8Array;
     /**
-     * @generated from protobuf field: repeated bytes neighborIds = 4;
+     * @generated from protobuf field: repeated bytes neighborNodeIds = 4;
      */
-    neighborIds: Uint8Array[];
+    neighborNodeIds: Uint8Array[];
     /**
-     * @generated from protobuf field: optional bytes interleaveSourceId = 5;
+     * @generated from protobuf field: optional bytes interleaveNodeId = 5;
      */
-    interleaveSourceId?: Uint8Array;
+    interleaveNodeId?: Uint8Array;
 }
 /**
  * @generated from protobuf message StreamPartHandshakeResponse
@@ -359,23 +359,6 @@ export interface NodeInfoResponse {
      */
     version: string;
 }
-/**
- * @generated from protobuf enum StreamMessageType
- */
-export enum StreamMessageType {
-    /**
-     * @generated from protobuf enum value: MESSAGE = 0;
-     */
-    MESSAGE = 0,
-    /**
-     * @generated from protobuf enum value: GROUP_KEY_REQUEST = 1;
-     */
-    GROUP_KEY_REQUEST = 1,
-    /**
-     * @generated from protobuf enum value: GROUP_KEY_RESPONSE = 2;
-     */
-    GROUP_KEY_RESPONSE = 2
-}
 /**
  * @generated from protobuf enum ContentType
  */
@@ -544,9 +527,9 @@ class StreamPartHandshakeRequest$Type extends MessageType<StreamPartHandshakeReq
         super("StreamPartHandshakeRequest", [
             { no: 1, name: "streamPartId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
             { no: 2, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "concurrentHandshakeTargetId", kind: "scalar", opt: true, T: 12 /*ScalarType.BYTES*/ },
-            { no: 4, name: "neighborIds", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 12 /*ScalarType.BYTES*/ },
-            { no: 5, name: "interleaveSourceId", kind: "scalar", opt: true, T: 12 /*ScalarType.BYTES*/ }
+            { no: 3, name: "concurrentHandshakeNodeId", kind: "scalar", opt: true, T: 12 /*ScalarType.BYTES*/ },
+            { no: 4, name: "neighborNodeIds", kind: "scalar", repeat: 2 /*RepeatType.UNPACKED*/, T: 12 /*ScalarType.BYTES*/ },
+            { no: 5, name: "interleaveNodeId", kind: "scalar", opt: true, T: 12 /*ScalarType.BYTES*/ }
         ]);
     }
 }

package/test/benchmark/StreamPartIdDataKeyDistribution.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 
 import { groupBy, range } from 'lodash'
-import { streamPartIdToDataKey } from '../../src/logic/EntryPointDiscovery'
+import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { DhtAddress } from '@streamr/dht'
 

package/test/benchmark/first-message.ts

@@ -23,9 +23,9 @@ import {
 import { hexToBinary, utf8ToBinary, waitForEvent3 } from '@streamr/utils'
 import fs from 'fs'
 import { NetworkNode } from '../../src/NetworkNode'
-import { streamPartIdToDataKey } from '../../src/logic/EntryPointDiscovery'
+import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 import { createMockPeerDescriptor, createNetworkNodeWithSimulator } from '../utils/utils'
-import { Layer1Node } from '../../src/logic/Layer1Node'
+import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 
 const numNodes = 10000
@@ -112,7 +112,7 @@ const measureJoiningTime = async () => {
     const streamSubscriber = await createNetworkNodeWithSimulator(
         peerDescriptor,
         simulator,
-        [randomNode.stack.getLayer0Node().getLocalPeerDescriptor()]
+        [randomNode.stack.getControlLayerNode().getLocalPeerDescriptor()]
     )
     currentNode = streamSubscriber
     const start = performance.now()
@@ -155,14 +155,14 @@ run().then(() => {
     console.error(err)
     const contentDeliveryManager = currentNode.stack.getContentDeliveryManager()
     const streamParts = contentDeliveryManager.getStreamParts()
-    const foundData = nodes[0].stack.getLayer0Node().fetchDataFromDht(streamPartIdToDataKey(streamParts[0]))
+    const foundData = nodes[0].stack.getControlLayerNode().fetchDataFromDht(streamPartIdToDataKey(streamParts[0]))
     console.log(foundData)
-    const layer0Node = currentNode.stack.getLayer0Node() as DhtNode
-    console.log(layer0Node.getNeighbors().length)
-    console.log(layer0Node.getConnectionsView().getConnectionCount())
+    const controlLayerNode = currentNode.stack.getControlLayerNode() as DhtNode
+    console.log(controlLayerNode.getNeighbors().length)
+    console.log(controlLayerNode.getConnectionsView().getConnectionCount())
     const streamPartDelivery = contentDeliveryManager
-        .getStreamPartDelivery(streamParts[0])! as { layer1Node: Layer1Node, node: ContentDeliveryLayerNode }
-    console.log(streamPartDelivery.layer1Node.getNeighbors())
+        .getStreamPartDelivery(streamParts[0])! as { discoveryLayerNode: DiscoveryLayerNode, node: ContentDeliveryLayerNode }
+    console.log(streamPartDelivery.discoveryLayerNode.getNeighbors())
     console.log(streamPartDelivery.node.getNeighbors())
     console.log(nodes[nodes.length - 1])
     if (publishInterval) {

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

@@ -5,8 +5,8 @@ import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
 import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
-import { Layer0Node } from '../../src/logic/Layer0Node'
-import { Layer1Node } from '../../src/logic/Layer1Node'
+import { ControlLayerNode } from '../../src/logic/ControlLayerNode'
+import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 
 describe('content delivery layer node with real connections', () => {
 
@@ -18,11 +18,11 @@ describe('content delivery layer node with real connections', () => {
     // Currently the nodes here are practically layer0 nodes acting as layer1 nodes, for the purpose of this test
     // they are layer1 nodes as the DHT is per stream
     // TODO refactor the test to use normal layering style (i.e. have separate objects for layer0 and layer1 nodes)
-    let epDhtNode: Layer0Node & Layer1Node
-    let dhtNode1: Layer0Node & Layer1Node
-    let dhtNode2: Layer0Node & Layer1Node
-    let dhtNode3: Layer0Node & Layer1Node
-    let dhtNode4: Layer0Node & Layer1Node
+    let epDhtNode: ControlLayerNode & DiscoveryLayerNode
+    let dhtNode1: ControlLayerNode & DiscoveryLayerNode
+    let dhtNode2: ControlLayerNode & DiscoveryLayerNode
+    let dhtNode3: ControlLayerNode & DiscoveryLayerNode
+    let dhtNode4: ControlLayerNode & DiscoveryLayerNode
     let contentDeliveryLayerNode1: ContentDeliveryLayerNode
     let contentDeliveryLayerNode2: ContentDeliveryLayerNode
     let contentDeliveryLayerNode3: ContentDeliveryLayerNode
@@ -45,7 +45,7 @@ describe('content delivery layer node with real connections', () => {
         contentDeliveryLayerNode1 = createContentDeliveryLayerNode(
             {
                 streamPartId,
-                layer1Node: epDhtNode,
+                discoveryLayerNode: epDhtNode,
                 transport: epDhtNode.getTransport(),
                 connectionLocker: epDhtNode.getTransport() as ConnectionManager,
                 localPeerDescriptor: epPeerDescriptor,
@@ -54,7 +54,7 @@ describe('content delivery layer node with real connections', () => {
         )
         contentDeliveryLayerNode2 = createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: dhtNode1,
+            discoveryLayerNode: dhtNode1,
             transport: dhtNode1.getTransport(),
             connectionLocker: dhtNode1.getTransport() as ConnectionManager,
             localPeerDescriptor: dhtNode1.getLocalPeerDescriptor(),
@@ -62,7 +62,7 @@ describe('content delivery layer node with real connections', () => {
         })
         contentDeliveryLayerNode3 = createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: dhtNode2,
+            discoveryLayerNode: dhtNode2,
             transport: dhtNode2.getTransport(),
             connectionLocker: dhtNode2.getTransport() as ConnectionManager,
             localPeerDescriptor: dhtNode2.getLocalPeerDescriptor(),
@@ -70,7 +70,7 @@ describe('content delivery layer node with real connections', () => {
         })
         contentDeliveryLayerNode4 = createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: dhtNode3,
+            discoveryLayerNode: dhtNode3,
             transport: dhtNode3.getTransport(),
             connectionLocker: dhtNode3.getTransport() as ConnectionManager,
             localPeerDescriptor: dhtNode3.getLocalPeerDescriptor(),
@@ -78,7 +78,7 @@ describe('content delivery layer node with real connections', () => {
         })
         contentDeliveryLayerNode5 = createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: dhtNode4,
+            discoveryLayerNode: dhtNode4,
             transport: dhtNode4.getTransport(),
             connectionLocker: dhtNode4.getTransport() as ConnectionManager,
             localPeerDescriptor: dhtNode4.getLocalPeerDescriptor(),

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

@@ -87,14 +87,14 @@ describe('proxy and full node', () => {
 
     it('proxied node can act as full node on another stream part', async () => {
         await proxiedNode.setProxies(proxiedStreamPart, [proxyNodeDescriptor], ProxyDirection.PUBLISH, PROXIED_NODE_USER_ID, 1)
-        expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(false)
+        expect(proxiedNode.stack.getControlLayerNode().hasJoined()).toBe(false)
 
         await Promise.all([
             waitForEvent3(proxyNode.stack.getContentDeliveryManager() as any, 'newMessage'),
             proxiedNode.broadcast(createMessage(regularStreamPart1))
         ])
 
-        expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(true)
+        expect(proxiedNode.stack.getControlLayerNode().hasJoined()).toBe(true)
 
         await Promise.all([
             waitForEvent3(proxyNode.stack.getContentDeliveryManager() as any, 'newMessage'),
@@ -107,7 +107,7 @@ describe('proxy and full node', () => {
 
     it('proxied node can act as full node on multiple stream parts', async () => {
         await proxiedNode.setProxies(proxiedStreamPart, [proxyNodeDescriptor], ProxyDirection.PUBLISH, PROXIED_NODE_USER_ID, 1)
-        expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(false)
+        expect(proxiedNode.stack.getControlLayerNode().hasJoined()).toBe(false)
 
         await Promise.all([
             waitForEvent3(proxyNode.stack.getContentDeliveryManager() as any, 'newMessage', 5000, 
@@ -124,7 +124,7 @@ describe('proxy and full node', () => {
             proxiedNode.broadcast(createMessage(regularStreamPart4))
         ])
 
-        expect(proxiedNode.stack.getLayer0Node().hasJoined()).toBe(true)
+        expect(proxiedNode.stack.getControlLayerNode().hasJoined()).toBe(true)
 
         await Promise.all([
             waitForEvent3(proxyNode.stack.getContentDeliveryManager() as any, 'newMessage'),

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

@@ -5,12 +5,12 @@ import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNo
 import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
 import { createMockPeerDescriptor } from '../utils/utils'
 import { StreamPartIDUtils } from '@streamr/protocol'
-import { Layer1Node } from '../../src/logic/Layer1Node'
+import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 
 describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
     const otherNodeCount = 64
-    let otherLayer1Nodes: Layer1Node[]
-    let entryPointLayer1Node: Layer1Node
+    let otherDiscoveryLayerNodes: DiscoveryLayerNode[]
+    let entryPointDiscoveryLayerNode: DiscoveryLayerNode
     let entryPointContentDeliveryLayerNode: ContentDeliveryLayerNode
     let otherContentDeliveryLayerNodes: ContentDeliveryLayerNode[]
 
@@ -27,13 +27,13 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
         await entrypointCm.start()
         await Promise.all(cms.map((cm) => cm.start()))
 
-        entryPointLayer1Node = new DhtNode({
+        entryPointDiscoveryLayerNode = new DhtNode({
             transport: entrypointCm,
             connectionsView: entrypointCm,
             peerDescriptor: entrypointDescriptor,
             serviceId: streamPartId
         })
-        otherLayer1Nodes = range(otherNodeCount).map((i) => new DhtNode({
+        otherDiscoveryLayerNodes = range(otherNodeCount).map((i) => new DhtNode({
             transport: cms[i],
             connectionsView: cms[i],
             peerDescriptor: peerDescriptors[i],
@@ -41,7 +41,7 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
         }))
         otherContentDeliveryLayerNodes = range(otherNodeCount).map((i) => createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: otherLayer1Nodes[i],
+            discoveryLayerNode: otherDiscoveryLayerNodes[i],
             transport: cms[i],
             connectionLocker: cms[i],
             localPeerDescriptor: peerDescriptors[i],
@@ -49,29 +49,29 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
         }))
         entryPointContentDeliveryLayerNode = createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: entryPointLayer1Node,
+            discoveryLayerNode: entryPointDiscoveryLayerNode,
             transport: entrypointCm,
             connectionLocker: entrypointCm,
             localPeerDescriptor: entrypointDescriptor,
             isLocalNodeEntryPoint: () => false
         })
 
-        await entryPointLayer1Node.start()
+        await entryPointDiscoveryLayerNode.start()
         entryPointContentDeliveryLayerNode.start()
-        await entryPointLayer1Node.joinDht([entrypointDescriptor])
-        await Promise.all(otherLayer1Nodes.map((node) => node.start()))
+        await entryPointDiscoveryLayerNode.joinDht([entrypointDescriptor])
+        await Promise.all(otherDiscoveryLayerNodes.map((node) => node.start()))
     })
 
     afterEach(async () => {
-        entryPointLayer1Node.stop()
+        entryPointDiscoveryLayerNode.stop()
         entryPointContentDeliveryLayerNode.stop()
-        await Promise.all(otherLayer1Nodes.map((node) => node.stop()))
+        await Promise.all(otherDiscoveryLayerNodes.map((node) => node.stop()))
         await Promise.all(otherContentDeliveryLayerNodes.map((node) => node.stop()))
     })
 
     it('happy path single node', async () => {
         await otherContentDeliveryLayerNodes[0].start()
-        await otherLayer1Nodes[0].joinDht([entrypointDescriptor])
+        await otherDiscoveryLayerNodes[0].joinDht([entrypointDescriptor])
         await Promise.all([
             waitForCondition(() => otherContentDeliveryLayerNodes[0].getNearbyNodeView().getIds().length === 1),
             waitForCondition(() => otherContentDeliveryLayerNodes[0].getNeighbors().length === 1)
@@ -83,7 +83,7 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
     it('happy path 5 nodes', async () => {
         range(4).forEach((i) => otherContentDeliveryLayerNodes[i].start())
         await Promise.all(range(4).map(async (i) => {
-            await otherLayer1Nodes[i].joinDht([entrypointDescriptor])
+            await otherDiscoveryLayerNodes[i].joinDht([entrypointDescriptor])
         }))
         await waitForCondition(() => range(4).every((i) => otherContentDeliveryLayerNodes[i].getNeighbors().length >= 4), 15000, 1000)
         range(4).forEach((i) => {
@@ -99,8 +99,8 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
                 const neighbor = allNodes.find((node) => {
                     return node.getOwnNodeId() === ownNodeId
                 })
-                const neighborIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
-                expect(neighborIds).toContain(nodeId)
+                const neighborNodeIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
+                expect(neighborNodeIds).toContain(nodeId)
             })
         })
     }, 60000)
@@ -108,7 +108,7 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
     it('happy path 64 nodes', async () => {
         await Promise.all(range(otherNodeCount).map((i) => otherContentDeliveryLayerNodes[i].start()))
         await Promise.all(range(otherNodeCount).map((i) => {
-            otherLayer1Nodes[i].joinDht([entrypointDescriptor])
+            otherDiscoveryLayerNodes[i].joinDht([entrypointDescriptor])
         }))
         await Promise.all(otherContentDeliveryLayerNodes.map((node) =>
             waitForCondition(() => node.getNeighbors().length >= 4, 10000)
@@ -126,8 +126,8 @@ describe('ContentDeliveryLayerNode-DhtNode-Latencies', () => {
                     const neighborId = getNodeIdFromPeerDescriptor(neighbor)
                     if (neighborId !== entryPointContentDeliveryLayerNode.getOwnNodeId()) {
                         const neighbor = otherContentDeliveryLayerNodes.find((n) => n.getOwnNodeId() === neighborId)
-                        const neighborIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
-                        if (!neighborIds.includes(nodeId)) {
+                        const neighborNodeIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
+                        if (!neighborNodeIds.includes(nodeId)) {
                             mismatchCounter += 1
                         }
                     }

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

@@ -5,14 +5,14 @@ import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNo
 import { createContentDeliveryLayerNode } from '../../src/logic/createContentDeliveryLayerNode'
 import { createMockPeerDescriptor } from '../utils/utils'
 import { StreamPartIDUtils } from '@streamr/protocol'
-import { Layer1Node } from '../../src/logic/Layer1Node'
+import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 
 const logger = new Logger(module)
 
 describe('ContentDeliveryLayerNode-DhtNode', () => {
     const otherNodeCount = 64
-    let entryPointLayer1Node: Layer1Node
-    let otherLayer1Nodes: Layer1Node[]
+    let entryPointDiscoveryLayerNode: DiscoveryLayerNode
+    let otherDiscoveryLayerNodes: DiscoveryLayerNode[]
     let entryPointContentDeliveryLayerNode: ContentDeliveryLayerNode
     let otherContentDeliveryLayerNodes: ContentDeliveryLayerNode[]
 
@@ -42,14 +42,14 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
         )
         await Promise.all(cms.map((cm) => cm.start()))
 
-        entryPointLayer1Node = new DhtNode({
+        entryPointDiscoveryLayerNode = new DhtNode({
             transport: entrypointCm,
             connectionsView: entrypointCm,
             peerDescriptor: entrypointDescriptor,
             serviceId: streamPartId
         })
 
-        otherLayer1Nodes = range(otherNodeCount).map((i) => new DhtNode({
+        otherDiscoveryLayerNodes = range(otherNodeCount).map((i) => new DhtNode({
             transport: cms[i],
             connectionsView: cms[i],
             peerDescriptor: peerDescriptors[i],
@@ -58,7 +58,7 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
 
         otherContentDeliveryLayerNodes = range(otherNodeCount).map((i) => createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: otherLayer1Nodes[i],
+            discoveryLayerNode: otherDiscoveryLayerNodes[i],
             transport: cms[i],
             connectionLocker: cms[i],
             localPeerDescriptor: peerDescriptors[i],
@@ -68,7 +68,7 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
 
         entryPointContentDeliveryLayerNode = createContentDeliveryLayerNode({
             streamPartId,
-            layer1Node: entryPointLayer1Node,
+            discoveryLayerNode: entryPointDiscoveryLayerNode,
             transport: entrypointCm,
             connectionLocker: entrypointCm,
             localPeerDescriptor: entrypointDescriptor,
@@ -76,22 +76,22 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
             isLocalNodeEntryPoint: () => false
         })
 
-        await entryPointLayer1Node.start()
+        await entryPointDiscoveryLayerNode.start()
         await entryPointContentDeliveryLayerNode.start()
-        await entryPointLayer1Node.joinDht([entrypointDescriptor])
-        await Promise.all(otherLayer1Nodes.map((node) => node.start()))
+        await entryPointDiscoveryLayerNode.joinDht([entrypointDescriptor])
+        await Promise.all(otherDiscoveryLayerNodes.map((node) => node.start()))
     })
 
     afterEach(async () => {
-        await entryPointLayer1Node.stop()
+        await entryPointDiscoveryLayerNode.stop()
         entryPointContentDeliveryLayerNode.stop()
-        await Promise.all(otherLayer1Nodes.map((node) => node.stop()))
+        await Promise.all(otherDiscoveryLayerNodes.map((node) => node.stop()))
         await Promise.all(otherContentDeliveryLayerNodes.map((node) => node.stop()))
     })
 
     it('happy path single node ', async () => {
         await otherContentDeliveryLayerNodes[0].start()
-        await otherLayer1Nodes[0].joinDht([entrypointDescriptor])
+        await otherDiscoveryLayerNodes[0].joinDht([entrypointDescriptor])
 
         await waitForCondition(() => otherContentDeliveryLayerNodes[0].getNeighbors().length === 1)
         expect(otherContentDeliveryLayerNodes[0].getNearbyNodeView().getIds().length).toEqual(1)
@@ -101,7 +101,7 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
     it('happy path 4 nodes', async () => {
         range(4).forEach((i) => otherContentDeliveryLayerNodes[i].start())
         await Promise.all(range(4).map(async (i) => {
-            await otherLayer1Nodes[i].joinDht([entrypointDescriptor])
+            await otherDiscoveryLayerNodes[i].joinDht([entrypointDescriptor])
         }))
 
         await waitForCondition(() => range(4).every((i) => otherContentDeliveryLayerNodes[i].getNeighbors().length === 4))
@@ -118,8 +118,8 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
                 const neighbor = allNodes.find((node) => {
                     return node.getOwnNodeId() === nodeId
                 })
-                const neighborIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
-                expect(neighborIds.includes(allNodes[i].getOwnNodeId())).toEqual(true)
+                const neighborNodeIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
+                expect(neighborNodeIds.includes(allNodes[i].getOwnNodeId())).toEqual(true)
             })
         })
     }, 10000)
@@ -127,7 +127,7 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
     it('happy path 64 nodes', async () => {
         await Promise.all(range(otherNodeCount).map((i) => otherContentDeliveryLayerNodes[i].start()))
         await Promise.all(range(otherNodeCount).map((i) => {
-            otherLayer1Nodes[i].joinDht([entrypointDescriptor])
+            otherDiscoveryLayerNodes[i].joinDht([entrypointDescriptor])
         }))
         await Promise.all(otherContentDeliveryLayerNodes.map((node) =>
             waitForCondition(() => node.getNeighbors().length >= 4, 10000)
@@ -149,8 +149,8 @@ describe('ContentDeliveryLayerNode-DhtNode', () => {
                     const neighborId = getNodeIdFromPeerDescriptor(neighbor)
                     if (neighborId !== entryPointContentDeliveryLayerNode.getOwnNodeId()) {
                         const neighbor = otherContentDeliveryLayerNodes.find((n) => n.getOwnNodeId() === neighborId)
-                        const neighborIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
-                        if (!neighborIds.includes(nodeId)) {
+                        const neighborNodeIds = neighbor!.getNeighbors().map((n) => getNodeIdFromPeerDescriptor(n))
+                        if (!neighborNodeIds.includes(nodeId)) {
                             mismatchCounter += 1
                         }
                     }

package/test/integration/ContentDeliveryManager.test.ts

@@ -8,12 +8,12 @@ import { waitForEvent3, waitForCondition } from '@streamr/utils'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { randomEthereumAddress } from '@streamr/test-utils'
-import { Layer0Node } from '../../src/logic/Layer0Node'
+import { ControlLayerNode } from '../../src/logic/ControlLayerNode'
 
 describe('ContentDeliveryManager', () => {
 
-    let layer0Node1: Layer0Node
-    let layer0Node2: Layer0Node
+    let controlLayerNode1: ControlLayerNode
+    let controlLayerNode2: ControlLayerNode
     let transport1: SimulatorTransport
     let transport2: SimulatorTransport
     let manager1: ContentDeliveryManager
@@ -42,32 +42,32 @@ describe('ContentDeliveryManager', () => {
         await transport1.start()
         transport2 = new SimulatorTransport(peerDescriptor2, simulator)
         await transport2.start()
-        layer0Node1 = new DhtNode({
+        controlLayerNode1 = new DhtNode({
             transport: transport1,
             connectionsView: transport1,
             peerDescriptor: peerDescriptor1,
             entryPoints: [peerDescriptor1]
         })
-        layer0Node2 = new DhtNode({
+        controlLayerNode2 = new DhtNode({
             transport: transport2,
             connectionsView: transport2,
             peerDescriptor: peerDescriptor2,
             entryPoints: [peerDescriptor1]
         })
         await Promise.all([
-            layer0Node1.start(),
-            layer0Node2.start()
+            controlLayerNode1.start(),
+            controlLayerNode2.start()
         ])
         await Promise.all([
-            layer0Node1.joinDht([peerDescriptor1]),
-            layer0Node2.joinDht([peerDescriptor1])
+            controlLayerNode1.joinDht([peerDescriptor1]),
+            controlLayerNode2.joinDht([peerDescriptor1])
         ])
 
         manager1 = new ContentDeliveryManager({})
         manager2 = new ContentDeliveryManager({})
-        await manager1.start(layer0Node1, transport1, transport1)
+        await manager1.start(controlLayerNode1, transport1, transport1)
         manager1.setStreamPartEntryPoints(STREAM_PART_ID, [peerDescriptor1])
-        await manager2.start(layer0Node2, transport2, transport2)
+        await manager2.start(controlLayerNode2, transport2, transport2)
         manager2.setStreamPartEntryPoints(STREAM_PART_ID, [peerDescriptor1])
     })
 

package/test/integration/Inspect.test.ts

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

package/test/integration/Propagation.test.ts

@@ -5,11 +5,11 @@ import { waitForCondition } from '@streamr/utils'
 import { range } from 'lodash'
 import { ContentDeliveryLayerNode } from '../../src/logic/ContentDeliveryLayerNode'
 import { createMockPeerDescriptor, createMockContentDeliveryLayerNodeAndDhtNode, createStreamMessage } from '../utils/utils'
-import { Layer1Node } from '../../src/logic/Layer1Node'
+import { DiscoveryLayerNode } from '../../src/logic/DiscoveryLayerNode'
 
 describe('Propagation', () => {
     const entryPointDescriptor = createMockPeerDescriptor()
-    let layer1Nodes: Layer1Node[]
+    let discoveryLayerNodes: DiscoveryLayerNode[]
     let contentDeliveryLayerNodes: ContentDeliveryLayerNode[]
     const STREAM_PART_ID = StreamPartIDUtils.parse('testingtesting#0')
     let totalReceived: number
@@ -18,7 +18,7 @@ describe('Propagation', () => {
     beforeEach(async () => {
         const simulator = new Simulator()
         totalReceived = 0
-        layer1Nodes = []
+        discoveryLayerNodes = []
         contentDeliveryLayerNodes = []
         const [entryPoint, node1] = await createMockContentDeliveryLayerNodeAndDhtNode(
             entryPointDescriptor,
@@ -30,7 +30,7 @@ describe('Propagation', () => {
         await entryPoint.joinDht([entryPointDescriptor])
         await node1.start()
         node1.on('message', () => {totalReceived += 1})
-        layer1Nodes.push(entryPoint)
+        discoveryLayerNodes.push(entryPoint)
         contentDeliveryLayerNodes.push(node1)
 
         await Promise.all(range(NUM_OF_NODES).map(async (_i) => {
@@ -45,7 +45,7 @@ describe('Propagation', () => {
             await contentDeliveryLayerNode.start()
             await layer1.joinDht([entryPointDescriptor]).then(() => {
                 contentDeliveryLayerNode.on('message', () => { totalReceived += 1 })
-                layer1Nodes.push(layer1)
+                discoveryLayerNodes.push(layer1)
                 contentDeliveryLayerNodes.push(contentDeliveryLayerNode)
             })
         }))
@@ -53,7 +53,7 @@ describe('Propagation', () => {
 
     afterEach(async () => {
         await Promise.all(contentDeliveryLayerNodes.map((node) => node.stop()))
-        await Promise.all(layer1Nodes.map((node) => node.stop()))
+        await Promise.all(discoveryLayerNodes.map((node) => node.stop()))
     })
 
     it('All nodes receive messages', async () => {

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

@@ -1,6 +1,6 @@
 import { PeerDescriptor, Simulator, SimulatorTransport, LatencyType } from '@streamr/dht'
 import { NetworkStack } from '../../src/NetworkStack'
-import { streamPartIdToDataKey } from '../../src/logic/EntryPointDiscovery'
+import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { Any } from '../../src/proto/google/protobuf/any'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
@@ -70,8 +70,8 @@ describe('Joining stream parts on offline nodes', () => {
         let messageReceived = false
 
         // store offline peer descriptors to DHT
-        await entryPoint.getLayer0Node().storeDataToDht(streamPartIdToDataKey(STREAM_PART_ID), Any.pack(offlineDescriptor1, PeerDescriptor))
-        await entryPoint.getLayer0Node().storeDataToDht(streamPartIdToDataKey(STREAM_PART_ID), Any.pack(offlineDescriptor2, PeerDescriptor))
+        await entryPoint.getControlLayerNode().storeDataToDht(streamPartIdToDataKey(STREAM_PART_ID), Any.pack(offlineDescriptor1, PeerDescriptor))
+        await entryPoint.getControlLayerNode().storeDataToDht(streamPartIdToDataKey(STREAM_PART_ID), Any.pack(offlineDescriptor2, PeerDescriptor))
         
         node1.getContentDeliveryManager().joinStreamPart(STREAM_PART_ID)
         node1.getContentDeliveryManager().on('newMessage', () => { messageReceived = true })

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

@@ -12,7 +12,7 @@ import {
 import { EthereumAddress, hexToBinary, utf8ToBinary, waitForCondition } from '@streamr/utils'
 import { range } from 'lodash'
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
-import { streamPartIdToDataKey } from '../../src/logic/EntryPointDiscovery'
+import { streamPartIdToDataKey } from '../../src/logic/ContentDeliveryManager'
 import { createMockPeerDescriptor } from '../utils/utils'
 
 const STREAM_PART_ID = StreamPartIDUtils.parse('test#0')
@@ -121,7 +121,7 @@ describe('stream without default entrypoints', () => {
             await nodes[i].join(STREAM_PART_ID, { minCount: (i > 0) ? 1 : 0, timeout: 15000 })
         }
         await waitForCondition(async () => {
-            const entryPointData = await nodes[15].stack.getLayer0Node().fetchDataFromDht(streamPartIdToDataKey(STREAM_PART_ID))
+            const entryPointData = await nodes[15].stack.getControlLayerNode().fetchDataFromDht(streamPartIdToDataKey(STREAM_PART_ID))
             return entryPointData.length >= 7
         }, 15000)
         

package/test/integration/streamEntryPointReplacing.test.ts

@@ -1,7 +1,7 @@
 import { Simulator, SimulatorTransport, LatencyType } from '@streamr/dht'
 import { NetworkStack } from '../../src/NetworkStack'
 import { createMockPeerDescriptor, createStreamMessage } from '../utils/utils'
-import { ENTRYPOINT_STORE_LIMIT } from '../../src/logic/EntryPointDiscovery'
+import { MAX_NODE_COUNT } from '../../src/logic/PeerDescriptorStoreManager'
 import { range } from 'lodash'
 import { StreamPartIDUtils } from '@streamr/protocol'
 import { waitForCondition } from '@streamr/utils'
@@ -50,7 +50,7 @@ describe('Stream Entry Points are replaced when known entry points leave streams
         await entryPointTransport.start()
         await layer0EntryPoint.start()
 
-        initialNodesOnStream = await Promise.all(range(ENTRYPOINT_STORE_LIMIT).map(async () => {
+        initialNodesOnStream = await Promise.all(range(MAX_NODE_COUNT).map(async () => {
             return await startNode()
         }))