@streamr/trackerless-network 100.0.0-pretestnet.6 → 100.0.0-rc.1

package/test/utils/mock/MockLayer0Node.ts

@@ -26,7 +26,7 @@ export class MockLayer0Node extends EventEmitter implements Layer0Node {
     }
 
     // eslint-disable-next-line class-methods-use-this
-    async getDataFromDht(): Promise<DataEntry[]> {
+    async fetchDataFromDht(): Promise<DataEntry[]> {
         return []
     }
 
@@ -45,7 +45,12 @@ export class MockLayer0Node extends EventEmitter implements Layer0Node {
     }
 
     // eslint-disable-next-line class-methods-use-this
-    getAllConnectionPeerDescriptors(): PeerDescriptor[] {
+    getConnections(): PeerDescriptor[] {
+        return []
+    }
+
+    // eslint-disable-next-line class-methods-use-this
+    getNeighbors(): PeerDescriptor[] {
         return []
     }
 

package/test/utils/mock/MockLayer1Node.ts

@@ -16,11 +16,11 @@ export class MockLayer1Node extends EventEmitter implements Layer1Node {
         return []
     }
 
-    getKBucketPeers(): PeerDescriptor[] {
+    getNeighbors(): PeerDescriptor[] {
         return this.kbucketPeers
     }
 
-    getBucketSize(): number {
+    getNeighborCount(): number {
         return this.kbucketPeers.length
     }
 
@@ -31,6 +31,9 @@ export class MockLayer1Node extends EventEmitter implements Layer1Node {
     // eslint-disable-next-line class-methods-use-this
     async joinDht(): Promise<void> {}
 
+    // eslint-disable-next-line class-methods-use-this
+    async joinRing(): Promise<void> {}
+
     // eslint-disable-next-line class-methods-use-this
     async start(): Promise<void> {}
 

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/mock/Transport.ts

@@ -14,7 +14,7 @@ export class MockTransport extends EventEmitter implements ITransport {
     }
 
     // eslint-disable-next-line class-methods-use-this
-    getAllConnectionPeerDescriptors(): PeerDescriptor[] {
+    getConnections(): PeerDescriptor[] {
         return []
     }
 

package/test/utils/utils.ts

@@ -1,12 +1,21 @@
-import { randomBytes } from 'crypto'
-import { ConnectionLocker, DhtNode, NodeType, PeerDescriptor, Simulator, SimulatorTransport, getRandomRegion } from '@streamr/dht'
+import { 
+    ConnectionLocker,
+    DhtNode,
+    NodeType,
+    PeerDescriptor,
+    Simulator,
+    SimulatorTransport,
+    createRandomDhtAddress,
+    getRandomRegion,
+    getRawFromDhtAddress
+} from '@streamr/dht'
 import { RandomGraphNode } from '../../src/logic/RandomGraphNode'
 import {
     ContentType,
     EncryptionType,
     MessageID,
-    StreamMessage,
-    StreamMessageType
+    SignatureType,
+    StreamMessage
 } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
 import { DeliveryRpcRemote } from '../../src/logic/DeliveryRpcRemote'
 import { createRandomGraphNode } from '../../src/logic/createRandomGraphNode'
@@ -14,8 +23,9 @@ import { HandshakeRpcRemote } from '../../src/logic/neighbor-discovery/Handshake
 import { NetworkNode, createNetworkNode } from '../../src/NetworkNode'
 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 +55,8 @@ export const createMockRandomGraphNodeAndDhtNode = async (
         layer1Node,
         connectionLocker: mockCm,
         localPeerDescriptor,
-        rpcRequestTimeout: 5000
+        rpcRequestTimeout: 5000,
+        isLocalNodeEntryPoint: () => false
     })
     return [layer1Node, randomGraphNode]
 }
@@ -66,51 +77,55 @@ export const createStreamMessage = (
         messageChainId: 'messageChain0',
     }
     const msg: StreamMessage = {
-        messageType: StreamMessageType.MESSAGE,
-        encryptionType: EncryptionType.NONE,
-        content: utf8ToBinary(content),
-        contentType: ContentType.JSON,
         messageId,
-        signature: hexToBinary('0x1234')
+        signatureType: SignatureType.SECP256K1,
+        signature: hexToBinary('0x1234'),
+        body: {
+            oneofKind: 'contentMessage',
+            contentMessage: {
+                encryptionType: EncryptionType.NONE,
+                contentType: ContentType.JSON,
+                content: utf8ToBinary(content)
+            }
+        }
     }
     return msg
 }
 
-export const createRandomNodeId = (): NodeID => {
-    return randomBytes(10).toString('hex') as NodeID
-}
-
-export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'kademliaId' | 'type'>): PeerDescriptor => {
+export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'nodeId' | 'type'>): PeerDescriptor => {
     return {
         ...opts,
-        kademliaId: hexToBinary(createRandomNodeId()),
+        nodeId: getRawFromDhtAddress(createRandomDhtAddress()),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
 }
 
 export const createMockDeliveryRpcRemote = (remotePeerDescriptor?: PeerDescriptor): DeliveryRpcRemote => {
-    return new DeliveryRpcRemote(createMockPeerDescriptor(), remotePeerDescriptor ?? createMockPeerDescriptor(), 'mock', {} as any)
+    return new DeliveryRpcRemote(
+        createMockPeerDescriptor(),
+        remotePeerDescriptor ?? createMockPeerDescriptor(),
+        new RpcCommunicator(),
+        DeliveryRpcClient
+    )
 }
 
 export const createMockHandshakeRpcRemote = (): HandshakeRpcRemote => {
     return new 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,

package/tsconfig.jest.json

@@ -6,11 +6,12 @@
     },
     "include": [
         "src/**/*",
-        "test/**/*"
-    ],
-    "exclude": [
+        "test/**/*",
+        "package.json"
     ],
     "references": [
-        { "path": "tsconfig.node.json" }
+        { "path": "../protocol/tsconfig.node.json" },
+        { "path": "../proto-rpc/tsconfig.node.json" },
+        { "path": "../dht/tsconfig.node.json" }
     ]
 }

package/tsconfig.node.json

@@ -6,9 +6,9 @@
     },
     "include": [
         "src/**/*",
-        "package.json",
         "test/benchmark/first-message.ts",
-        "test/utils/utils.ts"
+        "test/utils/utils.ts",
+        "package.json"
     ],
     "references": [
         { "path": "../protocol/tsconfig.node.json" },

package/dist/src/identifiers.d.ts

@@ -1,4 +0,0 @@
-import { PeerDescriptor } from '@streamr/dht';
-import { BrandedString } from '@streamr/utils';
-export type NodeID = BrandedString<'NodeID'>;
-export declare const getNodeIdFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => NodeID;

package/dist/src/identifiers.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeIdFromPeerDescriptor = void 0;
-const utils_1 = require("@streamr/utils");
-const getNodeIdFromPeerDescriptor = (peerDescriptor) => {
-    return (0, utils_1.binaryToHex)(peerDescriptor.kademliaId);
-};
-exports.getNodeIdFromPeerDescriptor = getNodeIdFromPeerDescriptor;
-//# sourceMappingURL=identifiers.js.map

package/dist/src/identifiers.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"identifiers.js","sourceRoot":"","sources":["../../src/identifiers.ts"],"names":[],"mappings":";;;AACA,0CAA2D;AAIpD,MAAM,2BAA2B,GAAG,CAAC,cAA8B,EAAU,EAAE;IAClF,OAAO,IAAA,mBAAW,EAAC,cAAc,CAAC,UAAU,CAAsB,CAAA;AACtE,CAAC,CAAA;AAFY,QAAA,2BAA2B,+BAEvC"}

package/src/identifiers.ts

@@ -1,8 +0,0 @@
-import { PeerDescriptor } from '@streamr/dht'
-import { BrandedString, binaryToHex } from '@streamr/utils'
-
-export type NodeID = BrandedString<'NodeID'>
-
-export const getNodeIdFromPeerDescriptor = (peerDescriptor: PeerDescriptor): NodeID => {
-    return binaryToHex(peerDescriptor.kademliaId) as unknown as NodeID
-}

package/test/unit/GroupKeyRequestTranslator.test.ts

@@ -1,36 +0,0 @@
-import { GroupKeyRequest as OldGroupKeyRequest } from '@streamr/protocol'
-import { hexToBinary, toEthereumAddress, utf8ToBinary } from '@streamr/utils'
-import { GroupKeyRequest } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
-import { GroupKeyRequestTranslator } from '../../src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator'
-
-describe('GroupKeyRequestTranslator', () => {
-
-    const oldGroupKeyRequest = new OldGroupKeyRequest({
-        rsaPublicKey: 'aaaaaaaa',
-        recipient: toEthereumAddress('0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
-        requestId: 'request',
-        groupKeyIds: ['id1', 'id2', 'id3']
-    })
-    const newGroupKeyRequest: GroupKeyRequest = {
-        rsaPublicKey: utf8ToBinary('aaaaaaaa'),
-        recipientId: hexToBinary('0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
-        requestId: 'request',
-        groupKeyIds: ['id1', 'id2', 'id3']
-    }
-
-    it('translates old protocol to protobuf', () => {
-        const translated = GroupKeyRequestTranslator.toProtobuf(oldGroupKeyRequest)
-        expect(translated.rsaPublicKey).toEqual(newGroupKeyRequest.rsaPublicKey)
-        expect(translated.recipientId).toEqual(newGroupKeyRequest.recipientId)
-        expect(translated.requestId).toEqual(newGroupKeyRequest.requestId)
-        expect(translated.groupKeyIds).toEqual(newGroupKeyRequest.groupKeyIds)
-    })
-
-    it('translates protobuf to old protocol', () => {
-        const translated = GroupKeyRequestTranslator.toClientProtocol(newGroupKeyRequest)
-        expect(translated.rsaPublicKey).toEqual(oldGroupKeyRequest.rsaPublicKey)
-        expect(translated.recipient).toEqual(oldGroupKeyRequest.recipient)
-        expect(translated.requestId).toEqual(oldGroupKeyRequest.requestId)
-        expect(translated.groupKeyIds).toEqual(oldGroupKeyRequest.groupKeyIds)
-    })
-})