use custom provider

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(),

src/ocean/Compute.ts

@@ -89,19 +89,12 @@ export class Compute extends Instantiable {
   ): Promise<ComputeJob> {
     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<ComputeJob> {
-    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<ComputeJob> {
-    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<ComputeJob[]> {
-    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<ComputeJob> {
-    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
+      serviceEndpoint: customProvider || this.ocean.provider.url,
-<<<<<<< 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
       attributes: {
         main: {
           name,

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<boolean>} string
    */
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 17e61d0... allow customProvider on publish
-=======
->>>>>>> 48cb847... extra check
-=======
->>>>>>> ae4011914b2749d3fa467d513c49ef97a8d22ed6
   public async isValidProvider(url: string): Promise<boolean> {
     const fetch = this.ocean.utils.fetch.get(url)
     await fetch
       .then((response: Response) => {
         if (response.ok) {
           const params = response.json()
-<<<<<<< HEAD
+          if(params)
-<<<<<<< HEAD
+            if (params['provider-address'])
-<<<<<<< HEAD
+              return true
-          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
         }
         return false
       })