From 21bebf474758eaae5f805c8aa5afa46ab885014e Mon Sep 17 00:00:00 2001
From: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Date: Wed, 12 Jan 2022 10:15:53 +0200
Subject: [PATCH] updated provider order for params

---
 src/provider/Provider.ts             | 23 +++++++++++++++--------
 test/integration/ComputeFlow.test.ts |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/provider/Provider.ts b/src/provider/Provider.ts
index b7b467c3..5ee3703a 100644
--- a/src/provider/Provider.ts
+++ b/src/provider/Provider.ts
@@ -73,10 +73,11 @@ export class Provider {
   public async getNonce(
     providerUri: string,
     consumerAddress: string,
-    fetchMethod: any,
+    fetchMethod?: any,
     providerEndpoints?: any,
     serviceEndpoints?: ServiceEndpoint[]
   ): Promise<string> {
+    const preferedFetch = fetchMethod || crossFetchGeneric
     if (!providerEndpoints) {
       providerEndpoints = await this.getEndpoints(providerUri)
     }
@@ -88,7 +89,7 @@ export class Provider {
       : null
     if (!path) return null
     try {
-      const response = await fetchMethod(
+      const response = await preferedFetch(
         'GET',
         path + `?userAddress=${consumerAddress}`,
         null,
@@ -127,7 +128,8 @@ export class Provider {
    * @param {string} postMethod http post method
    * @return {Promise<string>} urlDetails
    */
-  public async encrypt(data: any, providerUri: string, postMethod: any): Promise<any> {
+  public async encrypt(data: any, providerUri: string, postMethod?: any): Promise<any> {
+    const preferedFetch = postMethod || crossFetchGeneric
     const providerEndpoints = await this.getEndpoints(providerUri)
     const serviceEndpoints = await this.getServiceEndpoints(
       providerUri,
@@ -139,9 +141,14 @@ export class Provider {
 
     if (!path) return null
     try {
-      const response = await postMethod('POST', path, decodeURI(JSON.stringify(data)), {
-        'Content-Type': 'application/octet-stream'
-      })
+      const response = await preferedFetch(
+        'POST',
+        path,
+        decodeURI(JSON.stringify(data)),
+        {
+          'Content-Type': 'application/octet-stream'
+        }
+      )
       return response
     } catch (e) {
       LoggerInstance.error(e)
@@ -340,11 +347,11 @@ export class Provider {
   public async computeStart(
     providerUri: string,
     web3: Web3,
-    fetchMethod?: any,
     consumerAddress: string,
     computeEnv: string,
     dataset: ComputeAsset,
     algorithm: ComputeAlgorithm,
+    fetchMethod?: any,
     additionalDatasets?: ComputeAsset[],
     output?: ComputeOutput
   ): Promise<ComputeJob | ComputeJob[]> {
@@ -609,7 +616,7 @@ export class Provider {
     jobId: string,
     providerUri: string,
     web3: Web3,
-    fetchMethod: any
+    fetchMethod?: any
   ): Promise<ComputeJob | ComputeJob[]> {
     const preferedFetch = fetchMethod || crossFetchGeneric
     const providerEndpoints = await this.getEndpoints(providerUri)
diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts
index c13f3130..fdf4bca4 100644
--- a/test/integration/ComputeFlow.test.ts
+++ b/test/integration/ComputeFlow.test.ts
@@ -303,7 +303,6 @@ describe('Simple compute tests', async () => {
     const computeJobs = await ProviderInstance.computeStart(
       providerUrl,
       web3,
-      crossFetchGeneric,
       consumerAccount,
       'env1',
       {
@@ -315,7 +314,8 @@ describe('Simple compute tests', async () => {
         documentId: resolvedDDOAlgo.id,
         serviceId: resolvedDDOAlgo.services[0].id,
         transferTxId: txidAlgo.transactionHash
-      }
+      },
+      crossFetchGeneric
     )
     assert(computeJobs, 'Cannot start compute job')
     const jobStatus = await ProviderInstance.computeStatus(