@streamr/trackerless-network 100.0.0-testnet-two.0 → 100.0.0-testnet-two.2

package/test/utils/mock/MockHandshaker.ts

@@ -1,16 +1,16 @@
 import { Methods } from '@streamr/test-utils'
-import { NodeID } from '../../../src/identifiers'
 import { Handshaker } from '../../../src/logic/neighbor-discovery/Handshaker'
+import { DhtAddress } from '@streamr/dht'
 
 export class MockHandshaker implements Methods<Handshaker> {
 
     // eslint-disable-next-line class-methods-use-this
-    getOngoingHandshakes(): Set<NodeID> {
+    getOngoingHandshakes(): Set<DhtAddress> {
         return new Set()
     }
 
     // eslint-disable-next-line class-methods-use-this
-    async attemptHandshakesOnContacts(excludedIds: NodeID[]): Promise<NodeID[]> {
+    async attemptHandshakesOnContacts(excludedIds: DhtAddress[]): Promise<DhtAddress[]> {
         return excludedIds
     }
 

package/test/utils/utils.ts

@@ -1,5 +1,16 @@
 import { randomBytes } from 'crypto'
-import { ConnectionLocker, DhtNode, NodeType, PeerDescriptor, Simulator, SimulatorTransport, getRandomRegion } from '@streamr/dht'
+import { 
+    ConnectionLocker,
+    DhtAddress,
+    DhtNode,
+    NodeType,
+    PeerDescriptor,
+    Simulator,
+    SimulatorTransport,
+    getDhtAddressFromRaw,
+    getRandomRegion,
+    getRawFromDhtAddress
+} from '@streamr/dht'
 import { RandomGraphNode } from '../../src/logic/RandomGraphNode'
 import {
     ContentType,
@@ -14,7 +25,6 @@ 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'
@@ -79,14 +89,14 @@ export const createStreamMessage = (
     return msg
 }
 
-export const createRandomNodeId = (): NodeID => {
-    return randomBytes(10).toString('hex') as NodeID
+export const createRandomNodeId = (): DhtAddress => {
+    return getDhtAddressFromRaw(randomBytes(10))
 }
 
 export const createMockPeerDescriptor = (opts?: Omit<Partial<PeerDescriptor>, 'nodeId' | 'type'>): PeerDescriptor => {
     return {
         ...opts,
-        nodeId: hexToBinary(createRandomNodeId()),
+        nodeId: getRawFromDhtAddress(createRandomNodeId()),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
@@ -96,7 +106,6 @@ export const createMockDeliveryRpcRemote = (remotePeerDescriptor?: PeerDescripto
     return new DeliveryRpcRemote(
         createMockPeerDescriptor(),
         remotePeerDescriptor ?? createMockPeerDescriptor(),
-        'mock',
         new RpcCommunicator(),
         DeliveryRpcClient
     )
@@ -106,7 +115,6 @@ export const createMockHandshakeRpcRemote = (): HandshakeRpcRemote => {
     return new HandshakeRpcRemote(
         createMockPeerDescriptor(),
         createMockPeerDescriptor(), 
-        'mock',
         new RpcCommunicator(),
         HandshakeRpcClient
     )

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.nodeId);
-};
-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,MAAM,CAAsB,CAAA;AAClE,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.nodeId) as unknown as NodeID
-}