Bump prettier from 2.2.1 to 2.3.0 (#793)

* Bump prettier from 2.2.1 to 2.3.0

Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

* prettier updates

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

package-lock.json

@@ -39,15 +39,15 @@
         "cross-env": "^7.0.3",
         "eslint": "^7.17.0",
         "eslint-config-oceanprotocol": "^1.5.0",
-        "eslint-config-prettier": "^8.0.0",
+        "eslint-config-prettier": "^8.3.0",
-        "eslint-plugin-prettier": "^3.3.1",
+        "eslint-plugin-prettier": "^3.4.0",
         "lcov-result-merger": "^3.1.0",
         "microbundle": "^0.13.0",
         "mocha": "^8.2.1",
         "mock-local-storage": "^1.1.15",
         "nyc": "^15.1.0",
         "ora": "^5.2.0",
-        "prettier": "^2.2.1",
+        "prettier": "^2.3.0",
         "release-it": "^14.2.2",
         "source-map-support": "^0.5.19",
         "ts-node": "^9.1.1",
@@ -15691,9 +15691,10 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.2.1",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
+      "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -31483,7 +31484,9 @@
       "version": "2.0.0"
     },
     "prettier": {
-      "version": "2.2.1",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
+      "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
       "dev": true
     },
     "prettier-linter-helpers": {

package.json

@@ -75,15 +75,15 @@
     "cross-env": "^7.0.3",
     "eslint": "^7.17.0",
     "eslint-config-oceanprotocol": "^1.5.0",
-    "eslint-config-prettier": "^8.0.0",
+    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^3.4.0",
     "lcov-result-merger": "^3.1.0",
     "microbundle": "^0.13.0",
     "mocha": "^8.2.1",
     "mock-local-storage": "^1.1.15",
     "nyc": "^15.1.0",
     "ora": "^5.2.0",
-    "prettier": "^2.2.1",
+    "prettier": "^2.3.0",
     "release-it": "^14.2.2",
     "source-map-support": "^0.5.19",
     "ts-node": "^9.1.1",

src/datatokens/Datatokens.ts

@@ -47,10 +47,10 @@ export class DataTokens {
    * Generate new datatoken name & symbol from a word list
    * @return {<{ name: String; symbol: String }>} datatoken name & symbol. Produces e.g. "Endemic Jellyfish Token" & "ENDJEL-45"
    */
-  public generateDtName(wordList?: {
+  public generateDtName(wordList?: { nouns: string[]; adjectives: string[] }): {
-    nouns: string[]
+    name: string
-    adjectives: string[]
+    symbol: string
-  }): { name: string; symbol: string } {
+  } {
     const list = wordList || wordListDefault
     const random1 = Math.floor(Math.random() * list.adjectives.length)
     const random2 = Math.floor(Math.random() * list.nouns.length)

src/ocean/Compute.ts

@@ -617,9 +617,8 @@ export class Compute extends Instantiable {
     }
     if (typeof ddo.service[serviceIndex] === 'undefined') return null
     if (ddo.service[serviceIndex].type !== 'compute') return null
-    ddo.service[
+    ddo.service[serviceIndex].attributes.main.privacy.allowAllPublishedAlgorithms =
-      serviceIndex
+      newState
-    ].attributes.main.privacy.allowAllPublishedAlgorithms = newState
     return ddo
   }
 
@@ -734,13 +733,12 @@ export class Compute extends Instantiable {
     if (ddo.service[serviceIndex].type !== 'compute') return ddo
     if (!ddo.service[serviceIndex].attributes.main.privacy.publisherTrustedAlgorithms)
       return ddo
-    ddo.service[
+    ddo.service[serviceIndex].attributes.main.privacy.publisherTrustedAlgorithms =
-      serviceIndex
+      ddo.service[serviceIndex].attributes.main.privacy.publisherTrustedAlgorithms.filter(
-    ].attributes.main.privacy.publisherTrustedAlgorithms = ddo.service[
+        function (el) {
-      serviceIndex
+          return el.did !== algoDid
-    ].attributes.main.privacy.publisherTrustedAlgorithms.filter(function (el) {
+        }
-      return el.did !== algoDid
+      )
-    })
     return ddo
   }
 }

src/utils/ConfigHelper.ts

@@ -150,14 +150,8 @@ export class ConfigHelper {
     // use the defaults first
     let configAddresses: Partial<ConfigHelperConfig>
     if (DefaultContractsAddresses[network]) {
-      const {
+      const { DTFactory, BFactory, FixedRateExchange, Dispenser, Metadata, Ocean } =
-        DTFactory,
+        DefaultContractsAddresses[network]
-        BFactory,
-        FixedRateExchange,
-        Dispenser,
-        Metadata,
-        Ocean
-      } = DefaultContractsAddresses[network]
       configAddresses = {
         factoryAddress: DTFactory,
         poolFactoryAddress: BFactory,
@@ -178,14 +172,8 @@ export class ConfigHelper {
             'utf8'
           )
         )
-        const {
+        const { DTFactory, BFactory, FixedRateExchange, Dispenser, Metadata, Ocean } =
-          DTFactory,
+          data[network]
-          BFactory,
-          FixedRateExchange,
-          Dispenser,
-          Metadata,
-          Ocean
-        } = data[network]
         configAddresses = {
           factoryAddress: DTFactory,
           poolFactoryAddress: BFactory,

src/utils/SubscribablePromise.ts

@@ -17,9 +17,7 @@ export class SubscribablePromise<T extends any, P extends any> {
     setTimeout(() => this.init(executor), 1)
   }
 
-  public subscribe(
+  public subscribe(onNext: (next: T) => void): {
-    onNext: (next: T) => void
-  ): {
     unsubscribe: () => boolean
   } {
     return this.observer.subscribe(onNext)

test/integration/ComputeFlow.test.ts

@@ -104,8 +104,7 @@ describe('Compute flow', () => {
     language: 'js',
     format: 'docker-image',
     version: '0.1',
-    url:
+    url: 'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
-      'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
     container: {
       entrypoint: 'node $ALGO',
       image: 'node',
@@ -250,8 +249,7 @@ describe('Compute flow', () => {
         license: 'CC-BY',
         files: [
           {
-            url:
+            url: 'https://raw.githubusercontent.com/tbertinmahieux/MSongsDB/master/Tasks_Demos/CoverSongs/shs_dataset_test.txt',
-              'https://raw.githubusercontent.com/tbertinmahieux/MSongsDB/master/Tasks_Demos/CoverSongs/shs_dataset_test.txt',
             checksum: 'efb2c764274b745f5fc37f97c6b0e764',
             contentLength: '4535431',
             contentType: 'text/csv',
@@ -487,8 +485,7 @@ describe('Compute flow', () => {
         license: 'CC-BY',
         files: [
           {
-            url:
+            url: 'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
-              'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
             contentType: 'text/js',
             encoding: 'UTF-8'
           }
@@ -540,8 +537,7 @@ describe('Compute flow', () => {
         license: 'CC-BY',
         files: [
           {
-            url:
+            url: 'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
-              'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
             contentType: 'text/js',
             encoding: 'UTF-8'
           }
@@ -602,8 +598,7 @@ describe('Compute flow', () => {
         license: 'CC-BY',
         files: [
           {
-            url:
+            url: 'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
-              'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
             contentType: 'text/js',
             encoding: 'UTF-8'
           }
@@ -667,8 +662,7 @@ describe('Compute flow', () => {
         license: 'CC-BY',
         files: [
           {
-            url:
+            url: 'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
-              'https://raw.githubusercontent.com/oceanprotocol/test-algorithm/master/javascript/algo.js',
             contentType: 'text/js',
             encoding: 'UTF-8'
           }
@@ -1074,9 +1068,8 @@ describe('Compute flow', () => {
       algorithmAssetRemoteProviderWithCompute != null,
       'algorithmAsset should not be null'
     )
-    const serviceAlgo = algorithmAssetRemoteProviderWithCompute.findServiceByType(
+    const serviceAlgo =
-      'compute'
+      algorithmAssetRemoteProviderWithCompute.findServiceByType('compute')
-    )
     assert(serviceAlgo != null, 'serviceAlgo should not be null')
     // get the compute address first
     computeAddress = await ocean.compute.getComputeAddress(ddo.id, computeService.index)