From 4e02a1b2a5edc3cde91cb60a7c6f98b7f7e7e793 Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Wed, 9 Jun 2021 10:44:59 +0300 Subject: [PATCH] small refactor --- src/ocean/Compute.ts | 4 ++-- src/provider/Provider.ts | 2 +- src/utils/AssetResolverHelper.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ocean/Compute.ts b/src/ocean/Compute.ts index 25274483..92c51720 100644 --- a/src/ocean/Compute.ts +++ b/src/ocean/Compute.ts @@ -6,7 +6,7 @@ import { publisherTrustedAlgorithm } from '../ddo/interfaces/Service' import Account from './Account' -import { SubscribablePromise, assetResolve, AssetResolver } from '../utils' +import { SubscribablePromise, assetResolve, AssetResolved } from '../utils' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { ComputeOutput, @@ -413,7 +413,7 @@ export class Compute extends Instantiable { algorithm: ComputeAlgorithm, algorithmDDO?: DDO ): Promise { - const datasetResolved: AssetResolver = await assetResolve(dataset, this.ocean) + const datasetResolved: AssetResolved = await assetResolve(dataset, this.ocean) const service: Service = datasetResolved.ddo.findServiceById(serviceIndex) if (!service) return false if (service.type === 'compute') { diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts index 4f3a317a..d1d0ecc2 100644 --- a/src/provider/Provider.ts +++ b/src/provider/Provider.ts @@ -1,5 +1,5 @@ import Account from '../ocean/Account' -import { noZeroX, assetResolve, AssetResolver } from '../utils' +import { noZeroX, assetResolve } from '../utils' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { File } from '../ddo/interfaces/File' import { diff --git a/src/utils/AssetResolverHelper.ts b/src/utils/AssetResolverHelper.ts index 228d9d22..1969c7f5 100644 --- a/src/utils/AssetResolverHelper.ts +++ b/src/utils/AssetResolverHelper.ts @@ -1,7 +1,7 @@ import { DDO } from '../ddo/DDO' import { Ocean } from '../ocean/Ocean' -export interface AssetResolver { +export interface AssetResolved { did: string ddo: DDO } @@ -13,7 +13,7 @@ function isDdo(arg: any): arg is DDO { export async function assetResolve( asset: DDO | string, ocean: Ocean -): Promise { +): Promise { if (isDdo(asset)) { const did = asset.id const ddo = asset