From cdbc4c93a122d38cd10fd210978097869124602f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Guti=C3=A9rrez?= Date: Fri, 12 Jul 2019 16:56:01 +0200 Subject: [PATCH] Fix linter errors. --- src/brizo/Brizo.ts | 6 +++++- src/ocean/OceanAssets.ts | 6 ++++-- src/ocean/OceanSecretStore.ts | 29 +++++++++++++++++++------- src/ocean/utils/WebServiceConnector.ts | 3 ++- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/brizo/Brizo.ts b/src/brizo/Brizo.ts index cea4f78..94b060d 100644 --- a/src/brizo/Brizo.ts +++ b/src/brizo/Brizo.ts @@ -95,7 +95,11 @@ export class Brizo extends Instantiable { consumeUrl += `&signature=${signature}` try { - await this.ocean.utils.fetch.downloadFile(consumeUrl, destination, i) + await this.ocean.utils.fetch.downloadFile( + consumeUrl, + destination, + i + ) } catch (e) { this.logger.error('Error consuming assets') this.logger.error(e) diff --git a/src/ocean/OceanAssets.ts b/src/ocean/OceanAssets.ts index 55ce928..0e92d26 100644 --- a/src/ocean/OceanAssets.ts +++ b/src/ocean/OceanAssets.ts @@ -268,8 +268,10 @@ export class OceanAssets extends Instantiable { ddo.findServiceByType('Authorization').serviceEndpoint ) const downloads = files - .filter(({index: i}) => index === -1 || index === i) - .map(({url, index: i}) => this.ocean.utils.fetch.downloadFile(url, resultPath, i)) + .filter(({ index: i }) => index === -1 || index === i) + .map(({ url, index: i }) => + this.ocean.utils.fetch.downloadFile(url, resultPath, i) + ) await Promise.all(downloads) } this.logger.log('Files consumed') diff --git a/src/ocean/OceanSecretStore.ts b/src/ocean/OceanSecretStore.ts index f0efab9..7cf5954 100644 --- a/src/ocean/OceanSecretStore.ts +++ b/src/ocean/OceanSecretStore.ts @@ -1,5 +1,5 @@ -import SecretStore from "@oceanprotocol/secret-store-client" -import SecretStoreConfig from "@oceanprotocol/secret-store-client/dist/models/SecretStoreConfig" +import SecretStore from '@oceanprotocol/secret-store-client' +import SecretStoreConfig from '@oceanprotocol/secret-store-client/dist/models/SecretStoreConfig' import Account from './Account' import { noDidPrefixed } from '../utils' @@ -59,13 +59,20 @@ export class OceanSecretStore extends Instantiable { * @param {string} consumer cONSUMER account. * @return {Promise} Encrypted text. */ - public async decrypt(did: string, content: string, consumer?: Account, secretStoreUrl?: string): Promise { - return await this.getSecretStoreByAccount(consumer, secretStoreUrl) - .decryptDocument(noDidPrefixed(did), content) + public async decrypt( + did: string, + content: string, + consumer?: Account, + secretStoreUrl?: string + ): Promise { + return this.getSecretStoreByAccount( + consumer, + secretStoreUrl + ).decryptDocument(noDidPrefixed(did), content) } private getSecretStoreByAccount(account: Account, secretStoreUrl?: string) { - const config: any = {...this.config} + const config: any = { ...this.config } if (account) { config.address = account.getId() } @@ -79,8 +86,14 @@ export class OceanSecretStore extends Instantiable { } private getSecretStore(config: SecretStoreConfig): SecretStore { - const {secretStoreUri, parityUri, password, address, threshold} = config - config = {secretStoreUri, parityUri, password, address, threshold} + const { + secretStoreUri, + parityUri, + password, + address, + threshold + } = config + config = { secretStoreUri, parityUri, password, address, threshold } return new SecretStore(config) } diff --git a/src/ocean/utils/WebServiceConnector.ts b/src/ocean/utils/WebServiceConnector.ts index c700f14..972bd42 100644 --- a/src/ocean/utils/WebServiceConnector.ts +++ b/src/ocean/utils/WebServiceConnector.ts @@ -1,9 +1,10 @@ import fetch, { BodyInit, RequestInit, Response } from 'node-fetch' import * as fs from 'fs' -import save = require('save-file') import { Instantiable, InstantiableConfig } from '../../Instantiable.abstract' +import save = require('save-file') + /** * Provides a common interface to web services. */