deliveryLayerNeighbors -> contentDeliveryLayerNeighbors

streamr-dev · Apr 22, 2024 · ae475b1 · ae475b1
1 parent 7600bcf
commit ae475b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/crawler/Crawler.ts b/src/crawler/Crawler.ts
@@ -58,7 +58,7 @@ const createNodeInfoLogOutput = (nodeInfo: NodeInfo) => {
         streamPartitions: nodeInfo.streamPartitions.map((sp: any) => ({
             id: sp.id,
             controlLayerNeighbors: sp.controlLayerNeighbors.map((n: PeerDescriptor) => getNodeIdFromPeerDescriptor(n)),
-            deliveryLayerNeighbors: sp.deliveryLayerNeighbors.map((n: PeerDescriptor) => getNodeIdFromPeerDescriptor(n))
+            contentDeliveryLayerNeighbors: sp.contentDeliveryLayerNeighbors.map((n: PeerDescriptor) => getNodeIdFromPeerDescriptor(n))
         })),
         version: nodeInfo.version
     }
@@ -275,7 +275,7 @@ export class Crawler {
                 const streamPartitions = nodeInfo.streamPartitions.filter(
                     (sp) => StreamPartIDUtils.getStreamID(sp.id as StreamPartID) === payload.streamId
                 )
-                return (streamPartitions.map((sp) => sp.deliveryLayerNeighbors)).flat()
+                return (streamPartitions.map((sp) => sp.contentDeliveryLayerNeighbors)).flat()
             }, `stream-${payload.streamId}-${Date.now()}`)
             // TODO could add new nodes and neighbors to NodeRepository?
             await this.analyzeStream(payload.streamId, payload.metadata, topology, this.subscribeGate!)

diff --git a/src/crawler/Topology.ts b/src/crawler/Topology.ts
@@ -19,7 +19,7 @@ export class Topology {
         for (const info of infos) {
             const streamPartNeighbors: Multimap<StreamPartID, DhtAddress> = new Multimap()
             for (const streamPartitionInfo of info.streamPartitions) {
-                const neighbors = streamPartitionInfo.deliveryLayerNeighbors
+                const neighbors = streamPartitionInfo.contentDeliveryLayerNeighbors
                     .map((n) => getNodeIdFromPeerDescriptor(n))
                     .filter((id) => nodeIds.has(id))
                 streamPartNeighbors.addAll(StreamPartIDUtils.parse(streamPartitionInfo.id), neighbors)

diff --git a/test/Crawler.test.ts b/test/Crawler.test.ts
@@ -21,7 +21,7 @@ describe('Crawler', () => {
             streamPartitions: [{ 
                 id: STREAM_PART_ID,
                 controlLayerNeighbors: [],
-                deliveryLayerNeighbors: neighbors.get(getNodeIdFromPeerDescriptor(peerDescriptor)) ?? []
+                contentDeliveryLayerNeighbors: neighbors.get(getNodeIdFromPeerDescriptor(peerDescriptor)) ?? []
             }],
             version: ''
         }
@@ -58,7 +58,7 @@ describe('Crawler', () => {
         const topology = await crawlTopology(
             localNode as any,
             [nodes[0], nodes[5]],
-            (response: NodeInfo) => response.streamPartitions[0].deliveryLayerNeighbors,
+            (response: NodeInfo) => response.streamPartitions[0].contentDeliveryLayerNeighbors,
             ''
         )
         expect(localNode.fetchNodeInfo).toHaveBeenCalledTimes(nodes.length)

diff --git a/test/Topology.test.ts b/test/Topology.test.ts
@@ -16,13 +16,13 @@ describe('Topology', () => {
             peerDescriptor: nodes[0],
             streamPartitions: [{
                 id: STREAM_PART_ID_1,
-                deliveryLayerNeighbors: [nodes[1], nodes[2]]
+                contentDeliveryLayerNeighbors: [nodes[1], nodes[2]]
             }]
         }, {
             peerDescriptor: nodes[2],
             streamPartitions: [{
                 id: STREAM_PART_ID_2,
-                deliveryLayerNeighbors: [nodes[0], nodes[1], nodes[2]]
+                contentDeliveryLayerNeighbors: [nodes[0], nodes[1], nodes[2]]
             }]
         }] as any)
         expect([...topology.getNeighbors(getNodeIdFromPeerDescriptor(nodes[0]), STREAM_PART_ID_1)]).toIncludeSameMembers([