@streamr/trackerless-network 103.0.0-rc.0 → 103.0.0-rc.1

package/dist/generated/google/protobuf/empty.js

@@ -16,7 +16,20 @@ class Empty$Type extends runtime_3.MessageType {
         return message;
     }
     internalBinaryRead(reader, length, options, target) {
-        return target ?? this.create();
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? runtime_1.UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
     }
     internalBinaryWrite(message, writer, options) {
         let u = options.writeUnknownFields;

package/dist/generated/google/protobuf/empty.js.map

@@ -1 +1 @@
-{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../../../generated/google/protobuf/empty.ts"],"names":[],"mappings":";;;AAoCA,kDAA2D;AAI3D,kDAA8D;AAC9D,kDAAmD;AAenD,2FAA2F;AAC3F,MAAM,UAAW,SAAQ,qBAAkB;IACvC;QACI,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,CAAC,KAA6B;QAChC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAiB,CAAC,CAAC,CAAC;QACnE,IAAI,KAAK,KAAK,SAAS;YACnB,IAAA,gCAAsB,EAAQ,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACxD,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,kBAAkB,CAAC,MAAqB,EAAE,MAAc,EAAE,OAA0B,EAAE,MAAc;QAChG,OAAO,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IACD,mBAAmB,CAAC,OAAc,EAAE,MAAqB,EAAE,OAA2B;QAClF,IAAI,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACnC,IAAI,CAAC,KAAK,KAAK;YACX,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,6BAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AACD;;GAEG;AACU,QAAA,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC"}
+{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../../../generated/google/protobuf/empty.ts"],"names":[],"mappings":";;;AAsCA,kDAA2D;AAE3D,kDAA8D;AAC9D,kDAAmD;AAenD,2FAA2F;AAC3F,MAAM,UAAW,SAAQ,qBAAkB;IACvC;QACI,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,CAAC,KAA6B;QAChC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAiB,CAAC,CAAC,CAAC;QACnE,IAAI,KAAK,KAAK,SAAS;YACnB,IAAA,gCAAsB,EAAQ,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACxD,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,kBAAkB,CAAC,MAAqB,EAAE,MAAc,EAAE,OAA0B,EAAE,MAAc;QAChG,IAAI,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,GAAG,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;QACjE,OAAO,MAAM,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;YACvC,QAAQ,OAAO,EAAE,CAAC;gBACd;oBACI,IAAI,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;oBACjC,IAAI,CAAC,KAAK,OAAO;wBACb,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,iBAAiB,OAAO,eAAe,QAAQ,SAAS,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACxG,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAC9B,IAAI,CAAC,KAAK,KAAK;wBACX,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,6BAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;YACxG,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,mBAAmB,CAAC,OAAc,EAAE,MAAqB,EAAE,OAA2B;QAClF,IAAI,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACnC,IAAI,CAAC,KAAK,KAAK;YACX,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,6BAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AACD;;GAEG;AACU,QAAA,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC"}

package/dist/generated/packages/dht/protos/DhtRpc.client.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExternalApiRpcClient = exports.ConnectionLockRpcClient = exports.WebrtcConnectorRpcClient = exports.WebsocketClientConnectorRpcClient = exports.RecursiveOperationSessionRpcClient = exports.StoreRpcClient = exports.RecursiveOperationRpcClient = exports.RouterRpcClient = exports.DhtNodeRpcClient = void 0;
-// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.5 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/dht/protos/DhtRpc.proto" (package "dht", syntax proto3)
 // tslint:disable
 const DhtRpc_1 = require("./DhtRpc");

package/dist/generated/packages/dht/protos/DhtRpc.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionLockRpc = exports.WebrtcConnectorRpc = exports.WebsocketClientConnectorRpc = exports.RecursiveOperationSessionRpc = exports.StoreRpc = exports.RecursiveOperationRpc = exports.RouterRpc = exports.DhtNodeRpc = exports.ExternalFetchDataResponse = exports.ExternalFetchDataRequest = exports.SetPrivateRequest = exports.DisconnectNotice = exports.LockResponse = exports.UnlockRequest = exports.LockRequest = exports.IceCandidate = exports.RtcAnswer = exports.RtcOffer = exports.WebrtcConnectionRequest = exports.WebsocketConnectionRequest = exports.Message = exports.HandshakeResponse = exports.HandshakeRequest = exports.ConnectivityResponse = exports.ConnectivityRequest = exports.RouteMessageAck = exports.RouteMessageWrapper = exports.ConnectivityMethod = exports.PeerDescriptor = exports.LeaveNotice = exports.PingResponse = exports.PingRequest = exports.RecursiveOperationResponse = exports.RecursiveOperationRequest = exports.ClosestRingPeersResponse = exports.ClosestRingPeersRequest = exports.ClosestPeersResponse = exports.ClosestPeersRequest = exports.DataEntry = exports.ReplicateDataRequest = exports.ExternalStoreDataResponse = exports.ExternalStoreDataRequest = exports.StoreDataResponse = exports.StoreDataRequest = exports.DisconnectMode = exports.HandshakeError = exports.RouteMessageError = exports.RpcResponseError = exports.NodeType = exports.RecursiveOperation = void 0;
 exports.ExternalApiRpc = void 0;
-// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.5 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/dht/protos/DhtRpc.proto" (package "dht", syntax proto3)
 // tslint:disable
 const empty_1 = require("../../../google/protobuf/empty");

package/dist/generated/packages/proto-rpc/protos/ProtoRpc.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mnfo2uhnf92hvqi2nviouq2hv9puhq = exports.RpcMessage = exports.RpcErrorType = void 0;
-// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.5 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/proto-rpc/protos/ProtoRpc.proto" (package "protorpc", syntax proto3)
 // tslint:disable
 const runtime_1 = require("@protobuf-ts/runtime");

package/dist/generated/packages/trackerless-network/protos/NetworkRpc.client.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeInfoRpcClient = exports.TemporaryConnectionRpcClient = exports.NeighborUpdateRpcClient = exports.HandshakeRpcClient = exports.ProxyConnectionRpcClient = exports.ContentDeliveryRpcClient = void 0;
-// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.5 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/trackerless-network/protos/NetworkRpc.proto" (syntax proto3)
 // tslint:disable
 const NetworkRpc_1 = require("./NetworkRpc");

package/dist/generated/packages/trackerless-network/protos/NetworkRpc.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeInfoRpc = exports.TemporaryConnectionRpc = exports.NeighborUpdateRpc = exports.HandshakeRpc = exports.ProxyConnectionRpc = exports.ContentDeliveryRpc = exports.NodeInfoResponse = exports.NodeInfoRequest = exports.ControlLayerInfo = exports.ContentDeliveryLayerNeighborInfo = exports.StreamPartitionInfo = exports.CloseTemporaryConnection = exports.TemporaryConnectionResponse = exports.TemporaryConnectionRequest = exports.ProxyConnectionResponse = exports.ProxyConnectionRequest = exports.NeighborUpdate = exports.LeaveStreamPartNotice = exports.InterleaveResponse = exports.InterleaveRequest = exports.StreamPartHandshakeResponse = exports.StreamPartHandshakeRequest = exports.GroupKey = exports.GroupKeyResponse = exports.GroupKeyRequest = exports.ContentMessage = exports.StreamMessage = exports.MessageRef = exports.MessageID = exports.ProxyDirection = exports.SignatureType = exports.EncryptionType = exports.ContentType = void 0;
-// @generated by protobuf-ts 2.9.4 with parameter server_generic,generate_dependencies,long_type_number
+// @generated by protobuf-ts 2.9.5 with parameter server_generic,generate_dependencies,long_type_number
 // @generated from protobuf file "packages/trackerless-network/protos/NetworkRpc.proto" (syntax proto3)
 // tslint:disable
 const empty_1 = require("../../../google/protobuf/empty");

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/trackerless-network",
-    "version": "103.0.0-rc.0",
+    "version": "103.0.0-rc.1",
     "description": "Minimal and extendable implementation of the Streamr Network node.",
     "repository": {
         "type": "git",
@@ -9,6 +9,12 @@
     },
     "main": "dist/src/exports.js",
     "types": "dist/src/exports.d.ts",
+    "files": [
+        "dist",
+        "!*.tsbuildinfo",
+        "README.md",
+        "LICENSE"
+    ],
     "license": "STREAMR NETWORK OPEN SOURCE LICENSE",
     "author": "Streamr Network AG <contact@streamr.network>",
     "scripts": {
@@ -30,9 +36,9 @@
     "dependencies": {
         "@protobuf-ts/runtime": "^2.8.2",
         "@protobuf-ts/runtime-rpc": "^2.8.2",
-        "@streamr/dht": "103.0.0-rc.0",
-        "@streamr/proto-rpc": "103.0.0-rc.0",
-        "@streamr/utils": "103.0.0-rc.0",
+        "@streamr/dht": "103.0.0-rc.1",
+        "@streamr/proto-rpc": "103.0.0-rc.1",
+        "@streamr/utils": "103.0.0-rc.1",
         "eventemitter3": "^5.0.0",
         "lodash": "^4.17.21",
         "ts-essentials": "^10.0.4",
@@ -41,7 +47,7 @@
     },
     "devDependencies": {
         "@streamr/browser-test-runner": "^0.0.1",
-        "@streamr/test-utils": "103.0.0-rc.0",
+        "@streamr/test-utils": "103.0.0-rc.1",
         "@types/lodash": "^4.17.16",
         "@types/yallist": "^4.0.1",
         "expect": "^29.6.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/trackerless-network",
-  "version": "103.0.0-rc.0",
+  "version": "103.0.0-rc.1",
   "description": "Minimal and extendable implementation of the Streamr Network node.",
   "repository": {
     "type": "git",
@@ -9,6 +9,12 @@
   },
   "main": "dist/src/exports.js",
   "types": "dist/src/exports.d.ts",
+  "files": [
+    "dist",
+    "!*.tsbuildinfo",
+    "README.md",
+    "LICENSE"
+  ],
   "license": "STREAMR NETWORK OPEN SOURCE LICENSE",
   "author": "Streamr Network AG <contact@streamr.network>",
   "scripts": {
@@ -30,9 +36,9 @@
   "dependencies": {
     "@protobuf-ts/runtime": "^2.8.2",
     "@protobuf-ts/runtime-rpc": "^2.8.2",
-    "@streamr/dht": "103.0.0-rc.0",
-    "@streamr/proto-rpc": "103.0.0-rc.0",
-    "@streamr/utils": "103.0.0-rc.0",
+    "@streamr/dht": "103.0.0-rc.1",
+    "@streamr/proto-rpc": "103.0.0-rc.1",
+    "@streamr/utils": "103.0.0-rc.1",
     "eventemitter3": "^5.0.0",
     "lodash": "^4.17.21",
     "ts-essentials": "^10.0.4",
@@ -41,7 +47,7 @@
   },
   "devDependencies": {
     "@streamr/browser-test-runner": "^0.0.1",
-    "@streamr/test-utils": "103.0.0-rc.0",
+    "@streamr/test-utils": "103.0.0-rc.1",
     "@types/lodash": "^4.17.16",
     "@types/yallist": "^4.0.1",
     "expect": "^29.6.2",

package/jest.config.ts

@@ -1,13 +0,0 @@
-import type { Config } from '@jest/types'
-import defaultConfig from '../../jest.config'
-
-const config: Config.InitialOptions = {
-    ...defaultConfig,
-    setupFilesAfterEnv: [
-        ...defaultConfig.setupFilesAfterEnv,
-        '@streamr/test-utils/setupCustomMatchers',
-    ],
-    testTimeout: 15000,
-}
-
-export default config

package/karma-setup.js

@@ -1,7 +0,0 @@
-/**
- * This setup script is executed indirectly by Karma via the `browser-test-runner`
- * package. See karma-config.js in that package for more details.
- */
-
-const { customMatchers } = require('@streamr/test-utils')
-expect.extend(customMatchers)

package/karma.config.js

@@ -1,31 +0,0 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
-const path = require('path')
-const { createKarmaConfig, createWebpackConfig } = require('@streamr/browser-test-runner')
-
-const TEST_PATHS = [
-    './test/unit/**/*.ts',
-    './test/integration/**/*.ts',
-    './test/end-to-end/**/!(webrtc*|websocket*)',
-]
-
-module.exports = createKarmaConfig(TEST_PATHS, createWebpackConfig({
-    entry: './src/exports.ts',
-    libraryName: 'trackerless-network',
-    alias: {
-        [path.resolve(__dirname, '../dht/src/connection/webrtc/NodeWebrtcConnection.ts')]:
-            path.resolve(__dirname, '../dht/src/connection/webrtc/BrowserWebrtcConnection.ts'),
-        [path.resolve(__dirname, '../dht/src/connection/websocket/NodeWebsocketClientConnection.ts')]:
-            path.resolve(__dirname, '../dht/src/connection/websocket/BrowserWebsocketClientConnection.ts'),
-        '@streamr/dht': path.resolve('../dht/src/exports.ts'),
-        '@streamr/proto-rpc': path.resolve('../proto-rpc/src/exports.ts'),
-    },
-    fallback: {
-        module: false
-    },
-    externals: {
-        'node-datachannel': 'commonjs node-datachannel',
-        express: 'Express',
-        http: 'HTTP',
-        ws: 'WebSocket',
-    }
-}), __dirname)

package/proto.sh

@@ -1,2 +0,0 @@
-mkdir -p ./generated
-npx protoc --ts_out ./generated --ts_opt server_generic,generate_dependencies,long_type_number --proto_path ../.. packages/trackerless-network/protos/NetworkRpc.proto --experimental_allow_proto3_optional

package/protos/NetworkRpc.proto

@@ -1,186 +0,0 @@
-syntax = "proto3";
-
-option optimize_for = CODE_SIZE;
-
-import "google/protobuf/empty.proto";
-import "packages/dht/protos/DhtRpc.proto";
-
-service ContentDeliveryRpc {
-  rpc sendStreamMessage (StreamMessage) returns (google.protobuf.Empty);
-  rpc leaveStreamPartNotice (LeaveStreamPartNotice) returns (google.protobuf.Empty);
-}
-
-service ProxyConnectionRpc {
-  rpc requestConnection (ProxyConnectionRequest) returns (ProxyConnectionResponse);
-}
-
-service HandshakeRpc {
-  rpc handshake (StreamPartHandshakeRequest) returns (StreamPartHandshakeResponse);
-  rpc interleaveRequest (InterleaveRequest) returns (InterleaveResponse);
-}
-
-service NeighborUpdateRpc {
-  rpc neighborUpdate (NeighborUpdate) returns (NeighborUpdate);
-}
-
-service TemporaryConnectionRpc {
-  rpc openConnection (TemporaryConnectionRequest) returns (TemporaryConnectionResponse);
-  rpc closeConnection (CloseTemporaryConnection) returns (google.protobuf.Empty);
-}
-
-service NodeInfoRpc {
-  rpc getInfo (NodeInfoRequest) returns (NodeInfoResponse);
-}
-
-message MessageID {
-  string streamId = 1;
-  int32 streamPartition = 2;
-  int64 timestamp = 3;
-  int32 sequenceNumber = 4;
-  bytes publisherId = 5;
-  string messageChainId = 6;
-}
-
-message MessageRef {
-  int64 timestamp = 1;
-  int32 sequenceNumber = 2;
-}
-
-enum ContentType {
-  JSON = 0;
-  BINARY = 1;
-}
-
-enum EncryptionType {
-  NONE = 0;
-  AES = 1;
-}
-
-enum SignatureType {
-  LEGACY_SECP256K1 = 0;
-  SECP256K1 = 1;
-  ERC_1271 = 2;
-}
-
-message StreamMessage {
-  // this is a required field but in generated NetworkRpc.ts it is incorrectly annotated as optional (NET-1082)
-  MessageID messageId = 1;
-  optional MessageRef previousMessageRef = 2;
-  bytes signature = 3;
-  SignatureType signatureType = 4;
-  oneof body {
-    ContentMessage contentMessage = 5;
-    GroupKeyRequest groupKeyRequest = 6;
-    GroupKeyResponse groupKeyResponse = 7;
-  }
-}
-
-message ContentMessage {
-  bytes content = 1;
-  ContentType contentType = 2;
-  EncryptionType encryptionType = 3;
-  optional string groupKeyId = 4;
-  optional GroupKey newGroupKey = 5;
-}
-
-message GroupKeyRequest {
-  string requestId = 1;
-  bytes recipientId = 2;
-  bytes rsaPublicKey = 3;
-  repeated string groupKeyIds = 4;
-}
-
-message GroupKeyResponse {
-  string requestId = 1;
-  bytes recipientId = 2;
-  repeated GroupKey groupKeys = 3;
-}
-
-message GroupKey {
-  string id = 1;
-  bytes data = 2;
-}
-
-message StreamPartHandshakeRequest {
-  string streamPartId = 1;
-  string requestId = 2;
-  optional bytes concurrentHandshakeNodeId = 3;
-  repeated bytes neighborNodeIds = 4;
-  optional bytes interleaveNodeId = 5;
-}
-
-message StreamPartHandshakeResponse {
-  bool accepted = 1;
-  string requestId = 2;
-  optional dht.PeerDescriptor interleaveTargetDescriptor = 3;
-}
-
-message InterleaveRequest {
-  // this is a required field but in generated NetworkRpc.ts it is incorrectly annotated as optional (NET-1082)
-  dht.PeerDescriptor interleaveTargetDescriptor = 1;
-}
-
-message InterleaveResponse {
-  bool accepted = 1;
-}
-
-message LeaveStreamPartNotice {
-  string streamPartId = 1;
-  bool isEntryPoint = 2;
-}
-
-message NeighborUpdate {
-  string streamPartId = 1;
-  bool removeMe = 2;
-  repeated dht.PeerDescriptor neighborDescriptors = 3;
-}
-
-message ProxyConnectionRequest {
-  ProxyDirection direction = 1;
-  bytes userId = 2;
-}
-
-message ProxyConnectionResponse {
-  bool accepted = 1;
-}
-
-message TemporaryConnectionRequest {
-}
-
-message TemporaryConnectionResponse {
-  bool accepted = 1;
-}
-
-message CloseTemporaryConnection {
-}
-
-enum ProxyDirection {
-  PUBLISH = 0;
-  SUBSCRIBE = 1;
-}
-
-message StreamPartitionInfo {
-  string id = 1;
-  repeated dht.PeerDescriptor controlLayerNeighbors = 2;
-  repeated dht.PeerDescriptor deprecatedContentDeliveryLayerNeighbors = 3;
-  repeated ContentDeliveryLayerNeighborInfo contentDeliveryLayerNeighbors = 4;
-}
-
-message ContentDeliveryLayerNeighborInfo {
-  dht.PeerDescriptor peerDescriptor = 1;
-  optional int32 rtt = 2;
-}
-
-message ControlLayerInfo {
-  repeated dht.PeerDescriptor neighbors = 1;
-  repeated dht.PeerDescriptor connections = 2;
-}
-
-message NodeInfoRequest {}
-
-message NodeInfoResponse {
-  dht.PeerDescriptor peerDescriptor = 1;
-  repeated StreamPartitionInfo streamPartitions = 2;
-  ControlLayerInfo controlLayer = 3;
-  string applicationVersion = 4;
-}