@streamr/trackerless-network 100.0.0-testnet-two.4 → 100.0.0-testnet-three.1

package/test/unit/TemporaryConnectionRpcLocal.test.ts

@@ -0,0 +1,32 @@
+import { TemporaryConnectionRpcLocal } from '../../src/logic/temporary-connection/TemporaryConnectionRpcLocal'
+import { MockTransport } from '../utils/mock/Transport'
+import { createMockPeerDescriptor } from '../utils/utils'
+import { ListeningRpcCommunicator, getDhtAddressFromRaw } from '@streamr/dht'
+
+describe('TemporaryConnectionRpcLocal', () => {
+
+    const peerDescriptor = createMockPeerDescriptor()
+    let rpcCommunicator: ListeningRpcCommunicator
+    let rpcLocal: TemporaryConnectionRpcLocal
+
+    beforeEach(() => {
+        rpcCommunicator = new ListeningRpcCommunicator('mock', new MockTransport())
+        rpcLocal = new TemporaryConnectionRpcLocal({
+            localPeerDescriptor: peerDescriptor,
+            rpcCommunicator
+        })
+    })
+
+    afterEach(() => {
+        rpcCommunicator.destroy()
+    })
+
+    it('Open and Close Connection', async () => {
+        const caller = createMockPeerDescriptor()
+        await rpcLocal.openConnection({}, { incomingSourceDescriptor: caller } as any)
+        expect(rpcLocal.getNodes().get(getDhtAddressFromRaw(caller.nodeId))).toBeDefined()
+        await rpcLocal.closeConnection({}, { incomingSourceDescriptor: caller } as any)
+        expect(rpcLocal.getNodes().get(getDhtAddressFromRaw(caller.nodeId))).toBeUndefined()
+    })
+
+})

package/test/unit/oldStreamMessageBinaryUtils.test.ts

@@ -0,0 +1,39 @@
+import {
+    ContentType,
+    EncryptionType,
+    MessageID,
+    MessageRef,
+    SignatureType,
+    StreamMessage,
+    toStreamID
+} from '@streamr/protocol'
+import { toEthereumAddress } from '@streamr/utils'
+import { convertBytesToStreamMessage, convertStreamMessageToBytes } from '../../src/exports'
+
+describe('oldStreamMessageBinaryUtils', () => {
+    it('convertStreamMessageToBytes and convertBytesToStreamMessage', () => {
+        const streamMessage = new StreamMessage({
+            messageId: new MessageID(
+                toStreamID('test.ens/foobar'),
+                0,
+                10001,
+                0,
+                toEthereumAddress('0x1234567890123456789012345678901234567890'),
+                'msgChainId'
+            ),
+            prevMsgRef: new MessageRef(10000, 1),
+            content: new Uint8Array([1, 2, 3]),
+            contentType: ContentType.BINARY,
+            encryptionType: EncryptionType.NONE,
+            groupKeyId: '0x1234567890123456789012345678901234567890',
+            signatureType: SignatureType.SECP256K1,
+            signature: new Uint8Array([7, 8, 9])
+        })
+
+        const bytes = convertStreamMessageToBytes(streamMessage)
+        expect(bytes).toBeInstanceOf(Uint8Array)
+        expect(bytes.length).toBeGreaterThan(100)
+        const convertedStreamMessage = convertBytesToStreamMessage(bytes)
+        expect(convertedStreamMessage).toEqual(streamMessage)
+    })
+})

package/test/utils/mock/MockLayer0Node.ts

@@ -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 []
     }
 
-    getAllNeighborPeerDescriptors(): PeerDescriptor[] {
+    getNeighbors(): PeerDescriptor[] {
         return this.kbucketPeers
     }
 
-    getNumberOfNeighbors(): number {
+    getNeighborCount(): number {
         return this.kbucketPeers.length
     }
 

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

@@ -16,6 +16,7 @@ import {
     ContentType,
     EncryptionType,
     MessageID,
+    SignatureType,
     StreamMessage,
     StreamMessageType
 } from '../../src/proto/packages/trackerless-network/protos/NetworkRpc'
@@ -84,7 +85,8 @@ export const createStreamMessage = (
         content: utf8ToBinary(content),
         contentType: ContentType.JSON,
         messageId,
-        signature: hexToBinary('0x1234')
+        signature: hexToBinary('0x1234'),
+        signatureType: SignatureType.SECP256K1,
     }
     return msg
 }

package/tsconfig.jest.json

@@ -8,9 +8,9 @@
         "src/**/*",
         "test/**/*"
     ],
-    "exclude": [
-    ],
     "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,7 +6,6 @@
     },
     "include": [
         "src/**/*",
-        "package.json",
         "test/benchmark/first-message.ts",
         "test/utils/utils.ts"
     ],

package/dist/package.json

@@ -1,55 +0,0 @@
-{
-    "name": "@streamr/trackerless-network",
-    "version": "100.0.0-testnet-two.4",
-    "description": "Minimal and extendable implementation of the Streamr Network node.",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/streamr-dev/network-monorepo.git",
-        "directory": "packages/trackerless-network"
-    },
-    "main": "dist/src/exports.js",
-    "types": "dist/src/exports.d.ts",
-    "license": "STREAMR NETWORK OPEN SOURCE LICENSE",
-    "author": "Streamr Network AG <contact@streamr.network>",
-    "scripts": {
-        "build": "tsc -b tsconfig.node.json",
-        "build-browser": "webpack --mode=development --progress",
-        "generate-protoc-code": "./proto.sh",
-        "check": "tsc -p ./tsconfig.jest.json --noEmit",
-        "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
-        "coverage": "jest --coverage",
-        "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
-        "test": "npm run test-unit && npm run test-integration && npm run test-end-to-end",
-        "test-browser": "karma start karma.config.js",
-        "test-unit": "jest test/unit",
-        "test-integration": "jest --bail test/integration",
-        "test-end-to-end": "jest --bail test/end-to-end",
-        "network": "ts-node bin/network",
-        "run-joining-benchmark": "node --max-old-space-size=24288 dist/test/benchmark/first-message.js"
-    },
-    "dependencies": {
-        "@protobuf-ts/runtime": "^2.8.2",
-        "@protobuf-ts/runtime-rpc": "^2.8.2",
-        "@streamr/dht": "100.0.0-testnet-two.4",
-        "@streamr/proto-rpc": "100.0.0-testnet-two.4",
-        "@streamr/protocol": "100.0.0-testnet-two.4",
-        "@streamr/test-utils": "100.0.0-testnet-two.4",
-        "@streamr/utils": "100.0.0-testnet-two.4",
-        "eventemitter3": "^5.0.0",
-        "lodash": "^4.17.21",
-        "uuid": "^9.0.1",
-        "yallist": "^4.0.0"
-    },
-    "devDependencies": {
-        "@streamr/browser-test-runner": "^0.0.1",
-        "@types/lodash": "^4.14.202",
-        "@types/uuid": "^9.0.7",
-        "@types/yallist": "^4.0.1",
-        "commander": "^11.1.0",
-        "expect": "^29.6.2",
-        "express": "^4.17.1",
-        "ts-essentials": "^9.4.1",
-        "ts-loader": "^9.5.1",
-        "ts-node": "^10.9.1"
-    }
-}