1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

small refactor

This commit is contained in:
Bogdan Fazakas 2021-06-09 10:44:59 +03:00
parent 4f9ed04086
commit 4e02a1b2a5
3 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@ import {
publisherTrustedAlgorithm publisherTrustedAlgorithm
} from '../ddo/interfaces/Service' } from '../ddo/interfaces/Service'
import Account from './Account' import Account from './Account'
import { SubscribablePromise, assetResolve, AssetResolver } from '../utils' import { SubscribablePromise, assetResolve, AssetResolved } from '../utils'
import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
import { import {
ComputeOutput, ComputeOutput,
@ -413,7 +413,7 @@ export class Compute extends Instantiable {
algorithm: ComputeAlgorithm, algorithm: ComputeAlgorithm,
algorithmDDO?: DDO algorithmDDO?: DDO
): Promise<boolean> { ): Promise<boolean> {
const datasetResolved: AssetResolver = await assetResolve(dataset, this.ocean) const datasetResolved: AssetResolved = await assetResolve(dataset, this.ocean)
const service: Service = datasetResolved.ddo.findServiceById(serviceIndex) const service: Service = datasetResolved.ddo.findServiceById(serviceIndex)
if (!service) return false if (!service) return false
if (service.type === 'compute') { if (service.type === 'compute') {

View File

@ -1,5 +1,5 @@
import Account from '../ocean/Account' import Account from '../ocean/Account'
import { noZeroX, assetResolve, AssetResolver } from '../utils' import { noZeroX, assetResolve } from '../utils'
import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract'
import { File } from '../ddo/interfaces/File' import { File } from '../ddo/interfaces/File'
import { import {

View File

@ -1,7 +1,7 @@
import { DDO } from '../ddo/DDO' import { DDO } from '../ddo/DDO'
import { Ocean } from '../ocean/Ocean' import { Ocean } from '../ocean/Ocean'
export interface AssetResolver { export interface AssetResolved {
did: string did: string
ddo: DDO ddo: DDO
} }
@ -13,7 +13,7 @@ function isDdo(arg: any): arg is DDO {
export async function assetResolve( export async function assetResolve(
asset: DDO | string, asset: DDO | string,
ocean: Ocean ocean: Ocean
): Promise<AssetResolver> { ): Promise<AssetResolved> {
if (isDdo(asset)) { if (isDdo(asset)) {
const did = asset.id const did = asset.id
const ddo = asset const ddo = asset