From 86656490d8b0e295dbd06da1ca0036b07dd62d1c Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Sat, 19 Sep 2020 15:11:37 -0700 Subject: [PATCH] use custom provider --- src/ocean/Assets.ts | 18 ------------- src/ocean/Compute.ts | 57 ++++++++++++++++++---------------------- src/provider/Provider.ts | 31 +++------------------- 3 files changed, 29 insertions(+), 77 deletions(-) diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts index 95629d68..1947407b 100644 --- a/src/ocean/Assets.ts +++ b/src/ocean/Assets.ts @@ -393,25 +393,7 @@ export class Assets extends Instantiable { return { type: 'access', index: 2, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD serviceEndpoint: customProvider || this.ocean.provider.url, -======= - serviceEndpoint: customProvider || this.ocean.provider.getConsumeEndpoint(), ->>>>>>> 17e61d0... allow customProvider on publish -======= - serviceEndpoint: customProvider - ? customProvider + this.ocean.provider.getConsumeEndpointShort() - : this.ocean.provider.getConsumeEndpoint(), ->>>>>>> 960e90f... extra checks -======= - serviceEndpoint: customProvider || this.ocean.provider.url, ->>>>>>> 11b58cb... more customProvider code -======= - serviceEndpoint: customProvider || this.ocean.provider.url, ->>>>>>> ae4011914b2749d3fa467d513c49ef97a8d22ed6 attributes: { main: { creator: creator.getId(), diff --git a/src/ocean/Compute.ts b/src/ocean/Compute.ts index 2a53eb67..9963196e 100644 --- a/src/ocean/Compute.ts +++ b/src/ocean/Compute.ts @@ -89,19 +89,12 @@ export class Compute extends Instantiable { ): Promise { output = this.checkOutput(consumerAccount, output) const ddo = await this.ocean.assets.resolve(did) - const service = ddo.findServiceByType('access') + const service = ddo.findServiceByType('compute') const { serviceEndpoint } = service if (did && txId) { const provider = new Provider(this.instanceConfig) provider.setBaseUrl(serviceEndpoint) -<<<<<<< HEAD -<<<<<<< HEAD const computeJobsList = await provider.compute( -======= -======= ->>>>>>> ae4011914b2749d3fa467d513c49ef97a8d22ed6 - const computeJobsList = await this.ocean.provider.compute( ->>>>>>> 11b58cb... more customProvider code 'post', did, consumerAccount, @@ -132,7 +125,12 @@ export class Compute extends Instantiable { did: string, jobId: string ): Promise { - const computeJobsList = await this.ocean.provider.compute( + const ddo = await this.ocean.assets.resolve(did) + const service = ddo.findServiceByType('compute') + const { serviceEndpoint } = service + const provider = new Provider(this.instanceConfig) + provider.setBaseUrl(serviceEndpoint) + const computeJobsList = await provider.compute( 'put', did, consumerAccount, @@ -156,7 +154,12 @@ export class Compute extends Instantiable { did: string, jobId: string ): Promise { - const computeJobsList = await this.ocean.provider.compute( + const ddo = await this.ocean.assets.resolve(did) + const service = ddo.findServiceByType('compute') + const { serviceEndpoint } = service + const provider = new Provider(this.instanceConfig) + provider.setBaseUrl(serviceEndpoint) + const computeJobsList = await provider.compute( 'delete', did, consumerAccount, @@ -180,7 +183,12 @@ export class Compute extends Instantiable { did?: string, jobId?: string ): Promise { - const computeJobsList = await this.ocean.provider.compute( + const ddo = await this.ocean.assets.resolve(did) + const service = ddo.findServiceByType('compute') + const { serviceEndpoint } = service + const provider = new Provider(this.instanceConfig) + provider.setBaseUrl(serviceEndpoint) + const computeJobsList = await provider.compute( 'get', did, consumerAccount, @@ -204,7 +212,12 @@ export class Compute extends Instantiable { did: string, jobId: string ): Promise { - const computeJobsList = await this.ocean.provider.compute( + const ddo = await this.ocean.assets.resolve(did) + const service = ddo.findServiceByType('compute') + const { serviceEndpoint } = service + const provider = new Provider(this.instanceConfig) + provider.setBaseUrl(serviceEndpoint) + const computeJobsList = await provider.compute( 'get', did, consumerAccount, @@ -300,25 +313,7 @@ export class Compute extends Instantiable { const service = { type: 'compute', index: 3, -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - serviceEndpoint: customProvider - ? customProvider + this.ocean.provider.getComputeEndpointShort() - : this.ocean.provider.getComputeEndpoint(), -======= - serviceEndpoint: customProvider || this.ocean.provider.getComputeEndpoint(), ->>>>>>> 17e61d0... allow customProvider on publish -======= - serviceEndpoint: customProvider - ? customProvider + this.ocean.provider.getComputeEndpointShort() - : this.ocean.provider.getComputeEndpoint(), ->>>>>>> 960e90f... extra checks -======= - serviceEndpoint: customProvider - ? customProvider + this.ocean.provider.getComputeEndpointShort() - : this.ocean.provider.getComputeEndpoint(), ->>>>>>> ae4011914b2749d3fa467d513c49ef97a8d22ed6 + serviceEndpoint: customProvider || this.ocean.provider.url, attributes: { main: { name, diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts index 5911c21b..9a3da38b 100644 --- a/src/provider/Provider.ts +++ b/src/provider/Provider.ts @@ -298,44 +298,19 @@ export class Provider extends Instantiable { return `${this.url}${apiPath}/download` } -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 48cb847... extra check -======= ->>>>>>> ae4011914b2749d3fa467d513c49ef97a8d22ed6 /** Check for a valid provider at URL * @param {String} url * @return {Promise} string */ -<<<<<<< HEAD -<<<<<<< HEAD -======= ->>>>>>> 17e61d0... allow customProvider on publish -======= ->>>>>>> 48cb847... extra check -======= ->>>>>>> ae4011914b2749d3fa467d513c49ef97a8d22ed6 public async isValidProvider(url: string): Promise { const fetch = this.ocean.utils.fetch.get(url) await fetch .then((response: Response) => { if (response.ok) { const params = response.json() -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - if (params['provider-address']) return true -======= - if (params) return true ->>>>>>> 17e61d0... allow customProvider on publish -======= - if (params['provider-address']) return true ->>>>>>> 48cb847... extra check -======= - if (params['provider-address']) return true ->>>>>>> ae4011914b2749d3fa467d513c49ef97a8d22ed6 + if(params) + if (params['provider-address']) + return true } return false })