From 67f6e1633062368badecbe66a39261a37e396966 Mon Sep 17 00:00:00 2001
From: alexcos20 <alex.coseru@gmail.com>
Date: Sat, 19 Sep 2020 00:14:02 -0700
Subject: [PATCH] more customProvider code

---
 src/ocean/Assets.ts  | 4 ++++
 src/ocean/Compute.ts | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts
index 607737a3..97125c8f 100644
--- a/src/ocean/Assets.ts
+++ b/src/ocean/Assets.ts
@@ -394,6 +394,7 @@ export class Assets extends Instantiable {
       type: 'access',
       index: 2,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       serviceEndpoint: customProvider || this.ocean.provider.url,
 =======
@@ -404,6 +405,9 @@ export class Assets extends Instantiable {
         ? customProvider + this.ocean.provider.getConsumeEndpointShort()
         : this.ocean.provider.getConsumeEndpoint(),
 >>>>>>> 960e90f... extra checks
+=======
+      serviceEndpoint: customProvider || this.ocean.provider.url,
+>>>>>>> 11b58cb... more customProvider code
       attributes: {
         main: {
           creator: creator.getId(),
diff --git a/src/ocean/Compute.ts b/src/ocean/Compute.ts
index 5b3903b5..197a658f 100644
--- a/src/ocean/Compute.ts
+++ b/src/ocean/Compute.ts
@@ -94,7 +94,11 @@ export class Compute extends Instantiable {
     if (did && txId) {
       const provider = new Provider(this.instanceConfig)
       provider.setBaseUrl(serviceEndpoint)
+<<<<<<< HEAD
       const computeJobsList = await provider.compute(
+=======
+      const computeJobsList = await this.ocean.provider.compute(
+>>>>>>> 11b58cb... more customProvider code
         'post',
         did,
         consumerAccount,