@streamr/trackerless-network 100.0.0-pretestnet.4 → 100.0.0-testnet-one.0

package/src/proto/packages/dht/protos/DhtRpc.ts

@@ -14,21 +14,25 @@ import { Any } from "../../../google/protobuf/any";
  */
 export interface StoreDataRequest {
     /**
-     * @generated from protobuf field: bytes kademliaId = 1;
+     * @generated from protobuf field: bytes key = 1;
      */
-    kademliaId: Uint8Array;
+    key: Uint8Array;
     /**
      * @generated from protobuf field: google.protobuf.Any data = 2;
      */
     data?: Any;
     /**
-     * @generated from protobuf field: uint32 ttl = 3;
+     * @generated from protobuf field: dht.PeerDescriptor creator = 3;
      */
-    ttl: number;
+    creator?: PeerDescriptor;
     /**
-     * @generated from protobuf field: google.protobuf.Timestamp storerTime = 4;
+     * @generated from protobuf field: google.protobuf.Timestamp createdAt = 4;
+     */
+    createdAt?: Timestamp;
+    /**
+     * @generated from protobuf field: uint32 ttl = 5;
      */
-    storerTime?: Timestamp;
+    ttl: number;
 }
 /**
  * @generated from protobuf message dht.StoreDataResponse
@@ -62,86 +66,59 @@ export interface ExternalStoreDataResponse {
     storers: PeerDescriptor[];
 }
 /**
- * @generated from protobuf message dht.MigrateDataRequest
- */
-export interface MigrateDataRequest {
-    /**
-     * @generated from protobuf field: dht.DataEntry dataEntry = 1;
-     */
-    dataEntry?: DataEntry;
-}
-/**
- * @generated from protobuf message dht.MigrateDataResponse
- */
-export interface MigrateDataResponse {
-    /**
-     * @generated from protobuf field: string error = 1;
-     */
-    error: string;
-}
-/**
- * @generated from protobuf message dht.DeleteDataRequest
- */
-export interface DeleteDataRequest {
-    /**
-     * @generated from protobuf field: bytes kademliaId = 1;
-     */
-    kademliaId: Uint8Array;
-}
-/**
- * @generated from protobuf message dht.DeleteDataResponse
+ * @generated from protobuf message dht.ReplicateDataRequest
  */
-export interface DeleteDataResponse {
+export interface ReplicateDataRequest {
     /**
-     * @generated from protobuf field: bool deleted = 1;
+     * @generated from protobuf field: dht.DataEntry entry = 1;
      */
-    deleted: boolean;
+    entry?: DataEntry;
 }
 /**
  * @generated from protobuf message dht.DataEntry
  */
 export interface DataEntry {
     /**
-     * @generated from protobuf field: dht.PeerDescriptor storer = 1;
+     * @generated from protobuf field: bytes key = 1;
      */
-    storer?: PeerDescriptor;
+    key: Uint8Array;
     /**
-     * @generated from protobuf field: bytes kademliaId = 2;
+     * @generated from protobuf field: google.protobuf.Any data = 2;
      */
-    kademliaId: Uint8Array;
+    data?: Any;
     /**
-     * @generated from protobuf field: google.protobuf.Any data = 3;
+     * @generated from protobuf field: dht.PeerDescriptor creator = 3;
      */
-    data?: Any;
+    creator?: PeerDescriptor;
+    /**
+     * @generated from protobuf field: google.protobuf.Timestamp createdAt = 4;
+     */
+    createdAt?: Timestamp;
     /**
-     * @generated from protobuf field: google.protobuf.Timestamp storedAt = 4;
+     * @generated from protobuf field: google.protobuf.Timestamp storedAt = 5;
      */
     storedAt?: Timestamp;
     /**
-     * @generated from protobuf field: uint32 ttl = 5;
+     * @generated from protobuf field: uint32 ttl = 6;
      */
     ttl: number; // milliseconds
     /**
-     * @generated from protobuf field: bool stale = 6;
+     * @generated from protobuf field: bool stale = 7;
      */
     stale: boolean;
     /**
-     * @generated from protobuf field: bool deleted = 7;
+     * @generated from protobuf field: bool deleted = 8;
      */
     deleted: boolean;
-    /**
-     * @generated from protobuf field: google.protobuf.Timestamp storerTime = 8;
-     */
-    storerTime?: Timestamp;
 }
 /**
  * @generated from protobuf message dht.ClosestPeersRequest
  */
 export interface ClosestPeersRequest {
     /**
-     * @generated from protobuf field: bytes kademliaId = 1;
+     * @generated from protobuf field: bytes nodeId = 1;
      */
-    kademliaId: Uint8Array;
+    nodeId: Uint8Array;
     /**
      * @generated from protobuf field: string requestId = 2;
      */
@@ -169,9 +146,9 @@ export interface FindRequest {
      */
     sessionId: string;
     /**
-     * @generated from protobuf field: bool fetchData = 2;
+     * @generated from protobuf field: dht.FindAction action = 2;
      */
-    fetchData: boolean;
+    action: FindAction;
 }
 /**
  * @generated from protobuf message dht.FindResponse
@@ -186,9 +163,9 @@ export interface FindResponse {
      */
     dataEntries: DataEntry[];
     /**
-     * @generated from protobuf field: optional bool noCloserNodesFound = 3;
+     * @generated from protobuf field: bool noCloserNodesFound = 3;
      */
-    noCloserNodesFound?: boolean;
+    noCloserNodesFound: boolean;
     /**
      * @generated from protobuf field: repeated dht.PeerDescriptor routingPath = 4;
      */
@@ -226,9 +203,9 @@ export interface LeaveNotice {
  */
 export interface PeerDescriptor {
     /**
-     * @generated from protobuf field: bytes kademliaId = 1;
+     * @generated from protobuf field: bytes nodeId = 1;
      */
-    kademliaId: Uint8Array;
+    nodeId: Uint8Array;
     /**
      * @generated from protobuf field: dht.NodeType type = 2;
      */
@@ -305,9 +282,9 @@ export interface RouteMessageAck {
      */
     requestId: string;
     /**
-     * @generated from protobuf field: string error = 2;
+     * @generated from protobuf field: optional dht.RouteMessageError error = 2;
      */
-    error: string;
+    error?: RouteMessageError;
 }
 // Correspond to the MessageType Enum
 
@@ -536,10 +513,6 @@ export interface LockResponse {
      * @generated from protobuf field: bool accepted = 1;
      */
     accepted: boolean;
-    /**
-     * @generated from protobuf field: optional bool reason = 2;
-     */
-    reason?: boolean;
 }
 /**
  * @generated from protobuf message dht.DisconnectNotice
@@ -560,22 +533,35 @@ export interface DisconnectNoticeResponse {
  */
 export interface ExternalFindDataRequest {
     /**
-     * @generated from protobuf field: bytes kademliaId = 1;
+     * @generated from protobuf field: bytes key = 1;
      */
-    kademliaId: Uint8Array;
+    key: Uint8Array;
 }
 /**
  * @generated from protobuf message dht.ExternalFindDataResponse
  */
 export interface ExternalFindDataResponse {
     /**
-     * @generated from protobuf field: repeated dht.DataEntry dataEntries = 1;
+     * @generated from protobuf field: repeated dht.DataEntry entries = 1;
      */
-    dataEntries: DataEntry[];
+    entries: DataEntry[];
+}
+/**
+ * @generated from protobuf enum dht.FindAction
+ */
+export enum FindAction {
+    /**
+     * @generated from protobuf enum value: NODE = 0;
+     */
+    NODE = 0,
+    /**
+     * @generated from protobuf enum value: FETCH_DATA = 1;
+     */
+    FETCH_DATA = 1,
     /**
-     * @generated from protobuf field: optional string error = 2;
+     * @generated from protobuf enum value: DELETE_DATA = 2;
      */
-    error?: string;
+    DELETE_DATA = 2
 }
 /**
  * @generated from protobuf enum dht.NodeType
@@ -615,6 +601,26 @@ export enum RpcResponseError {
      */
     UNKNOWN_RPC_METHOD = 3
 }
+/**
+ * @generated from protobuf enum dht.RouteMessageError
+ */
+export enum RouteMessageError {
+    /**
+     * @generated from protobuf enum value: NO_TARGETS = 0;
+     */
+    NO_TARGETS = 0,
+    /**
+     * @generated from protobuf enum value: DUPLICATE = 1;
+     */
+    DUPLICATE = 1,
+    /**
+     * TODO: can this be removed? If DhtNode is already stopped the server side requests
+     * should not be processed
+     *
+     * @generated from protobuf enum value: STOPPED = 2;
+     */
+    STOPPED = 2
+}
 /**
  * @generated from protobuf enum dht.HandshakeError
  */
@@ -676,10 +682,11 @@ export enum DisconnectMode {
 class StoreDataRequest$Type extends MessageType$<StoreDataRequest> {
     constructor() {
         super("dht.StoreDataRequest", [
-            { no: 1, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
+            { no: 1, name: "key", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 2, name: "data", kind: "message", T: () => Any },
-            { no: 3, name: "ttl", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 4, name: "storerTime", kind: "message", T: () => Timestamp }
+            { no: 3, name: "creator", kind: "message", T: () => PeerDescriptor },
+            { no: 4, name: "createdAt", kind: "message", T: () => Timestamp },
+            { no: 5, name: "ttl", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
         ]);
     }
 }
@@ -725,65 +732,29 @@ class ExternalStoreDataResponse$Type extends MessageType$<ExternalStoreDataRespo
  */
 export const ExternalStoreDataResponse = new ExternalStoreDataResponse$Type();
 // @generated message type with reflection information, may provide speed optimized methods
-class MigrateDataRequest$Type extends MessageType$<MigrateDataRequest> {
+class ReplicateDataRequest$Type extends MessageType$<ReplicateDataRequest> {
     constructor() {
-        super("dht.MigrateDataRequest", [
-            { no: 1, name: "dataEntry", kind: "message", T: () => DataEntry }
+        super("dht.ReplicateDataRequest", [
+            { no: 1, name: "entry", kind: "message", T: () => DataEntry }
         ]);
     }
 }
 /**
- * @generated MessageType for protobuf message dht.MigrateDataRequest
+ * @generated MessageType for protobuf message dht.ReplicateDataRequest
  */
-export const MigrateDataRequest = new MigrateDataRequest$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class MigrateDataResponse$Type extends MessageType$<MigrateDataResponse> {
-    constructor() {
-        super("dht.MigrateDataResponse", [
-            { no: 1, name: "error", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message dht.MigrateDataResponse
- */
-export const MigrateDataResponse = new MigrateDataResponse$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class DeleteDataRequest$Type extends MessageType$<DeleteDataRequest> {
-    constructor() {
-        super("dht.DeleteDataRequest", [
-            { no: 1, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message dht.DeleteDataRequest
- */
-export const DeleteDataRequest = new DeleteDataRequest$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class DeleteDataResponse$Type extends MessageType$<DeleteDataResponse> {
-    constructor() {
-        super("dht.DeleteDataResponse", [
-            { no: 1, name: "deleted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
-        ]);
-    }
-}
-/**
- * @generated MessageType for protobuf message dht.DeleteDataResponse
- */
-export const DeleteDataResponse = new DeleteDataResponse$Type();
+export const ReplicateDataRequest = new ReplicateDataRequest$Type();
 // @generated message type with reflection information, may provide speed optimized methods
 class DataEntry$Type extends MessageType$<DataEntry> {
     constructor() {
         super("dht.DataEntry", [
-            { no: 1, name: "storer", kind: "message", T: () => PeerDescriptor },
-            { no: 2, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
-            { no: 3, name: "data", kind: "message", T: () => Any },
-            { no: 4, name: "storedAt", kind: "message", T: () => Timestamp },
-            { no: 5, name: "ttl", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
-            { no: 6, name: "stale", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 7, name: "deleted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 8, name: "storerTime", kind: "message", T: () => Timestamp }
+            { no: 1, name: "key", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
+            { no: 2, name: "data", kind: "message", T: () => Any },
+            { no: 3, name: "creator", kind: "message", T: () => PeerDescriptor },
+            { no: 4, name: "createdAt", kind: "message", T: () => Timestamp },
+            { no: 5, name: "storedAt", kind: "message", T: () => Timestamp },
+            { no: 6, name: "ttl", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 7, name: "stale", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
+            { no: 8, name: "deleted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
 }
@@ -795,7 +766,7 @@ export const DataEntry = new DataEntry$Type();
 class ClosestPeersRequest$Type extends MessageType$<ClosestPeersRequest> {
     constructor() {
         super("dht.ClosestPeersRequest", [
-            { no: 1, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
+            { no: 1, name: "nodeId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 2, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
         ]);
     }
@@ -822,7 +793,7 @@ class FindRequest$Type extends MessageType$<FindRequest> {
     constructor() {
         super("dht.FindRequest", [
             { no: 1, name: "sessionId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "fetchData", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
+            { no: 2, name: "action", kind: "enum", T: () => ["dht.FindAction", FindAction] }
         ]);
     }
 }
@@ -836,7 +807,7 @@ class FindResponse$Type extends MessageType$<FindResponse> {
         super("dht.FindResponse", [
             { no: 1, name: "closestConnectedPeers", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor },
             { no: 2, name: "dataEntries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => DataEntry },
-            { no: 3, name: "noCloserNodesFound", kind: "scalar", opt: true, T: 8 /*ScalarType.BOOL*/ },
+            { no: 3, name: "noCloserNodesFound", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
             { no: 4, name: "routingPath", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => PeerDescriptor }
         ]);
     }
@@ -885,7 +856,7 @@ export const LeaveNotice = new LeaveNotice$Type();
 class PeerDescriptor$Type extends MessageType$<PeerDescriptor> {
     constructor() {
         super("dht.PeerDescriptor", [
-            { no: 1, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
+            { no: 1, name: "nodeId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ },
             { no: 2, name: "type", kind: "enum", T: () => ["dht.NodeType", NodeType] },
             { no: 3, name: "udp", kind: "message", T: () => ConnectivityMethod },
             { no: 4, name: "tcp", kind: "message", T: () => ConnectivityMethod },
@@ -934,7 +905,7 @@ class RouteMessageAck$Type extends MessageType$<RouteMessageAck> {
     constructor() {
         super("dht.RouteMessageAck", [
             { no: 1, name: "requestId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "error", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+            { no: 2, name: "error", kind: "enum", opt: true, T: () => ["dht.RouteMessageError", RouteMessageError] }
         ]);
     }
 }
@@ -1119,8 +1090,7 @@ export const UnlockRequest = new UnlockRequest$Type();
 class LockResponse$Type extends MessageType$<LockResponse> {
     constructor() {
         super("dht.LockResponse", [
-            { no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "reason", kind: "scalar", opt: true, T: 8 /*ScalarType.BOOL*/ }
+            { no: 1, name: "accepted", kind: "scalar", T: 8 /*ScalarType.BOOL*/ }
         ]);
     }
 }
@@ -1154,7 +1124,7 @@ export const DisconnectNoticeResponse = new DisconnectNoticeResponse$Type();
 class ExternalFindDataRequest$Type extends MessageType$<ExternalFindDataRequest> {
     constructor() {
         super("dht.ExternalFindDataRequest", [
-            { no: 1, name: "kademliaId", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
+            { no: 1, name: "key", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
         ]);
     }
 }
@@ -1166,8 +1136,7 @@ export const ExternalFindDataRequest = new ExternalFindDataRequest$Type();
 class ExternalFindDataResponse$Type extends MessageType$<ExternalFindDataResponse> {
     constructor() {
         super("dht.ExternalFindDataResponse", [
-            { no: 1, name: "dataEntries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => DataEntry },
-            { no: 2, name: "error", kind: "scalar", opt: true, T: 9 /*ScalarType.STRING*/ }
+            { no: 1, name: "entries", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => DataEntry }
         ]);
     }
 }
@@ -1201,8 +1170,7 @@ export const FindRpc = new ServiceType("dht.FindRpc", [
  */
 export const StoreRpc = new ServiceType("dht.StoreRpc", [
     { name: "storeData", options: {}, I: StoreDataRequest, O: StoreDataResponse },
-    { name: "migrateData", options: {}, I: MigrateDataRequest, O: MigrateDataResponse },
-    { name: "deleteData", options: {}, I: DeleteDataRequest, O: DeleteDataResponse }
+    { name: "replicateData", options: {}, I: ReplicateDataRequest, O: Empty }
 ]);
 /**
  * @generated ServiceType for protobuf service dht.FindSessionRpc

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

@@ -11,7 +11,7 @@ import { Layer1Node } from '../../src/logic/Layer1Node'
 describe('random graph with real connections', () => {
 
     const epPeerDescriptor: PeerDescriptor = {
-        kademliaId: Uint8Array.from([1, 2, 3]),
+        nodeId: Uint8Array.from([1, 2, 3]),
         type: NodeType.NODEJS,
         websocket: { host: '127.0.0.1', port: 12221, tls: false }
     }

package/test/integration/DeliveryRpcRemote.test.ts

@@ -26,11 +26,11 @@ describe('DeliveryRpcRemote', () => {
     let rpcRemote: DeliveryRpcRemote
 
     const clientNode: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 1, 1]),
+        nodeId: new Uint8Array([1, 1, 1]),
         type: NodeType.NODEJS
     }
     const serverNode: PeerDescriptor = {
-        kademliaId: new Uint8Array([2, 2, 2]),
+        nodeId: new Uint8Array([2, 2, 2]),
         type: NodeType.NODEJS
     }
 

package/test/integration/HandshakeRpcRemote.test.ts

@@ -21,11 +21,11 @@ describe('HandshakeRpcRemote', () => {
     let rpcRemote: HandshakeRpcRemote
 
     const clientNode: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 1, 1]),
+        nodeId: new Uint8Array([1, 1, 1]),
         type: NodeType.NODEJS
     }
     const serverNode: PeerDescriptor = {
-        kademliaId: new Uint8Array([2, 2, 2]),
+        nodeId: new Uint8Array([2, 2, 2]),
         type: NodeType.NODEJS
     }
 

package/test/integration/Handshakes.test.ts

@@ -20,15 +20,15 @@ import { StreamPartIDUtils } from '@streamr/protocol'
 describe('Handshakes', () => {
 
     const peerDescriptor1: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 1, 1]),
+        nodeId: new Uint8Array([1, 1, 1]),
         type: NodeType.NODEJS
     }
     const peerDescriptor2: PeerDescriptor = {
-        kademliaId: new Uint8Array([2, 1, 1]),
+        nodeId: new Uint8Array([2, 1, 1]),
         type: NodeType.NODEJS
     }
     const peerDescriptor3: PeerDescriptor = {
-        kademliaId: new Uint8Array([3, 1, 1]),
+        nodeId: new Uint8Array([3, 1, 1]),
         type: NodeType.NODEJS
     }
     let rpcCommunicator1: ListeningRpcCommunicator

package/test/integration/NeighborUpdateRpcRemote.test.ts

@@ -19,11 +19,11 @@ describe('NeighborUpdateRpcRemote', () => {
     let rpcRemote: NeighborUpdateRpcRemote
 
     const clientNode: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 1, 1]),
+        nodeId: new Uint8Array([1, 1, 1]),
         type: NodeType.NODEJS
     }
     const serverNode: PeerDescriptor = {
-        kademliaId: new Uint8Array([2, 2, 2]),
+        nodeId: new Uint8Array([2, 2, 2]),
         type: NodeType.NODEJS
     }
 
@@ -47,7 +47,7 @@ describe('NeighborUpdateRpcRemote', () => {
             'neighborUpdate',
             async (): Promise<NeighborUpdate> => {
                 const node: PeerDescriptor = {
-                    kademliaId: new Uint8Array([4, 2, 4]),
+                    nodeId: new Uint8Array([4, 2, 4]),
                     type: NodeType.NODEJS
                 }
                 const update: NeighborUpdate = {

package/test/integration/NetworkNode.test.ts

@@ -20,12 +20,12 @@ describe('NetworkNode', () => {
     let node2: NetworkNode
 
     const pd1: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 2, 3]),
+        nodeId: new Uint8Array([1, 2, 3]),
         type: NodeType.NODEJS
     }
 
     const pd2: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 1, 1]),
+        nodeId: new Uint8Array([1, 1, 1]),
         type: NodeType.NODEJS
     }
 

package/test/integration/StreamrNode.test.ts

@@ -22,11 +22,11 @@ describe('StreamrNode', () => {
     let node2: StreamrNode
 
     const peerDescriptor1: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 2, 3]),
+        nodeId: new Uint8Array([1, 2, 3]),
         type: NodeType.NODEJS
     }
     const peerDescriptor2: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 1, 1]),
+        nodeId: new Uint8Array([1, 1, 1]),
         type: NodeType.NODEJS
     }
     const STREAM_PART_ID = StreamPartIDUtils.parse('test#0')

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

@@ -12,31 +12,31 @@ const STREAM_PART_ID = StreamPartIDUtils.parse('stream#0')
 describe('Joining stream parts on offline nodes', () => {
 
     const entryPointPeerDescriptor: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 2, 3]),
+        nodeId: new Uint8Array([1, 2, 3]),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
 
     const node1PeerDescriptor: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 1, 1]),
+        nodeId: new Uint8Array([1, 1, 1]),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
 
     const node2PeerDescriptor: PeerDescriptor = {
-        kademliaId: new Uint8Array([2, 2, 2]),
+        nodeId: new Uint8Array([2, 2, 2]),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
 
     const offlineDescriptor1: PeerDescriptor = {
-        kademliaId: new Uint8Array([3, 3, 3]),
+        nodeId: new Uint8Array([3, 3, 3]),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }
 
     const offlineDescriptor2: PeerDescriptor = {
-        kademliaId: new Uint8Array([4, 4, 4]),
+        nodeId: new Uint8Array([4, 4, 4]),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }

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

@@ -20,7 +20,7 @@ describe('stream without default entrypoints', () => {
     let nodes: NetworkNode[]
     let numOfReceivedMessages: number
     const entryPointPeerDescriptor: PeerDescriptor = {
-        kademliaId: new Uint8Array([1, 2, 3]),
+        nodeId: new Uint8Array([1, 2, 3]),
         type: NodeType.NODEJS,
         region: getRandomRegion()
     }

package/test/unit/EntrypointDiscovery.test.ts

@@ -20,19 +20,19 @@ describe('EntryPointDiscovery', () => {
     const deletedPeerDescriptor = createMockPeerDescriptor()
 
     const fakeData: DataEntry = {
+        key: Uint8Array.from([1, 2, 3]),
         data: Any.pack(peerDescriptor, PeerDescriptor),
+        creator: peerDescriptor,
         ttl: 1000,
-        storer: peerDescriptor,
-        kademliaId: Uint8Array.from([1, 2, 3]),
         stale: false,
         deleted: false
     }
 
     const fakeDeletedData: DataEntry = {
+        key: Uint8Array.from([1, 2, 3]),
         data: Any.pack(deletedPeerDescriptor, PeerDescriptor),
+        creator: deletedPeerDescriptor,
         ttl: 1000,
-        storer: deletedPeerDescriptor,
-        kademliaId: Uint8Array.from([1, 2, 3]),
         stale: false,
         deleted: true
     }

package/test/unit/HandshakeRpcLocal.test.ts

@@ -88,7 +88,7 @@ describe('HandshakeRpcLocal', () => {
         const req: InterleaveNotice = {
             streamPartId: STREAM_PART_ID,
             interleaveTargetDescriptor: {
-                kademliaId: hexToBinary('0x2222'),
+                nodeId: hexToBinary('0x2222'),
                 type: NodeType.NODEJS
             }
 
@@ -103,7 +103,7 @@ describe('HandshakeRpcLocal', () => {
         const req: InterleaveNotice = {
             streamPartId: StreamPartIDUtils.parse('other-stream#0'),
             interleaveTargetDescriptor: {
-                kademliaId: hexToBinary('0x2222'),
+                nodeId: hexToBinary('0x2222'),
                 type: NodeType.NODEJS
             }
         }