diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts index f86a216e..1a8bf501 100644 --- a/src/ocean/Assets.ts +++ b/src/ocean/Assets.ts @@ -15,6 +15,8 @@ import DID from './DID' import { SubscribablePromise } from '../utils' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { WebServiceConnector } from './utils/WebServiceConnector' +import { Output } from './interfaces/ComputeOutput' +import { ComputeJob } from './interfaces/ComputeJob' export enum CreateProgressStep { CreatingDataToken, @@ -45,32 +47,6 @@ export const ComputeJobStatus = Object.freeze({ Deleted: 90 }) -export interface Output { - publishAlgorithmLog?: boolean - publishOutput?: boolean - providerAddress?: string - providerUri?: string - metadata?: Metadata - metadataUri?: string - nodeUri?: string - owner?: string - secretStoreUri?: string - whitelist?: string[] -} - -export interface ComputeJob { - owner: string - did: string - jobId: string - dateCreated: string - dateFinished: string - status: number - statusText: string - algorithmLogUrl: string - resultsUrls: string[] - resultsDid?: DID -} - /** * Assets submodule of Ocean Protocol. */ diff --git a/src/ocean/interfaces/ComputeJob.ts b/src/ocean/interfaces/ComputeJob.ts new file mode 100644 index 00000000..74b8cf6e --- /dev/null +++ b/src/ocean/interfaces/ComputeJob.ts @@ -0,0 +1,14 @@ +import DID from '../DID' + +export interface ComputeJob { + owner: string + did: string + jobId: string + dateCreated: string + dateFinished: string + status: number + statusText: string + algorithmLogUrl: string + resultsUrls: string[] + resultsDid?: DID +} diff --git a/src/ocean/interfaces/ComputeOutput.ts b/src/ocean/interfaces/ComputeOutput.ts new file mode 100644 index 00000000..1abf5d72 --- /dev/null +++ b/src/ocean/interfaces/ComputeOutput.ts @@ -0,0 +1,14 @@ +import { Metadata } from '../../ddo/interfaces/Metadata' + +export interface Output { + publishAlgorithmLog?: boolean + publishOutput?: boolean + providerAddress?: string + providerUri?: string + metadata?: Metadata + metadataUri?: string + nodeUri?: string + owner?: string + secretStoreUri?: string + whitelist?: string[] +} diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts index 72fa6bc8..14b6c2e4 100644 --- a/src/provider/Provider.ts +++ b/src/provider/Provider.ts @@ -2,7 +2,8 @@ import Account from '../ocean/Account' import { noZeroX } from '../utils' import { Instantiable, InstantiableConfig } from '../Instantiable.abstract' import { File } from '../ddo/interfaces/File' -import { ComputeJob, Output } from '../ocean/Assets' +import { ComputeJob } from '../ocean/interfaces/ComputeJob' +import { Output } from '../ocean/interfaces/ComputeOutput' import { MetadataAlgorithm } from '../ddo/interfaces/MetadataAlgorithm' const apiPath = '/api/v1/services'