oceanprotocol/ocean.js
1
0
Fork 0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00
Code Releases Activity

updated provider order for params

Browse Source
This commit is contained in:
Bogdan Fazakas 2022-01-12 10:15:53 +02:00
parent 9076ae05b1
commit 21bebf4747
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/provider/Provider.ts
View File

@ -73,10 +73,11 @@ export class Provider {
public async getNonce( public async getNonce(
providerUri: string, providerUri: string,
consumerAddress: string, consumerAddress: string,
fetchMethod: any, fetchMethod?: any,
providerEndpoints?: any, providerEndpoints?: any,
serviceEndpoints?: ServiceEndpoint[] serviceEndpoints?: ServiceEndpoint[]
): Promise<string> { ): Promise<string> {
const preferedFetch = fetchMethod || crossFetchGeneric
if (!providerEndpoints) { if (!providerEndpoints) {
providerEndpoints = await this.getEndpoints(providerUri) providerEndpoints = await this.getEndpoints(providerUri)
} }
@ -88,7 +89,7 @@ export class Provider {
: null : null
if (!path) return null if (!path) return null
try { try {
const response = await fetchMethod( const response = await preferedFetch(
'GET', 'GET',
path + `?userAddress=${consumerAddress}`, path + `?userAddress=${consumerAddress}`,
null, null,
@ -127,7 +128,8 @@ export class Provider {
* @param {string} postMethod http post method * @param {string} postMethod http post method
* @return {Promise<string>} urlDetails * @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 providerEndpoints = await this.getEndpoints(providerUri)
const serviceEndpoints = await this.getServiceEndpoints( const serviceEndpoints = await this.getServiceEndpoints(
providerUri, providerUri,
@ -139,9 +141,14 @@ export class Provider {
if (!path) return null if (!path) return null
try { try {
const response = await postMethod('POST', path, decodeURI(JSON.stringify(data)), { const response = await preferedFetch(
'POST',
path,
decodeURI(JSON.stringify(data)),
{
'Content-Type': 'application/octet-stream' 'Content-Type': 'application/octet-stream'
}) }
)
return response return response
} catch (e) { } catch (e) {
LoggerInstance.error(e) LoggerInstance.error(e)
@ -340,11 +347,11 @@ export class Provider {
public async computeStart( public async computeStart(
providerUri: string, providerUri: string,
web3: Web3, web3: Web3,
fetchMethod?: any,
consumerAddress: string, consumerAddress: string,
computeEnv: string, computeEnv: string,
dataset: ComputeAsset, dataset: ComputeAsset,
algorithm: ComputeAlgorithm, algorithm: ComputeAlgorithm,
fetchMethod?: any,
additionalDatasets?: ComputeAsset[], additionalDatasets?: ComputeAsset[],
output?: ComputeOutput output?: ComputeOutput
): Promise<ComputeJob | ComputeJob[]> { ): Promise<ComputeJob | ComputeJob[]> {
@ -609,7 +616,7 @@ export class Provider {
jobId: string, jobId: string,
providerUri: string, providerUri: string,
web3: Web3, web3: Web3,
fetchMethod: any fetchMethod?: any
): Promise<ComputeJob | ComputeJob[]> { ): Promise<ComputeJob | ComputeJob[]> {
const preferedFetch = fetchMethod || crossFetchGeneric const preferedFetch = fetchMethod || crossFetchGeneric
const providerEndpoints = await this.getEndpoints(providerUri) const providerEndpoints = await this.getEndpoints(providerUri)

4
test/integration/ComputeFlow.test.ts
View File

@ -303,7 +303,6 @@ describe('Simple compute tests', async () => {
const computeJobs = await ProviderInstance.computeStart( const computeJobs = await ProviderInstance.computeStart(
providerUrl, providerUrl,
web3, web3,
crossFetchGeneric,
consumerAccount, consumerAccount,
'env1', 'env1',
{ {
@ -315,7 +314,8 @@ describe('Simple compute tests', async () => {
documentId: resolvedDDOAlgo.id, documentId: resolvedDDOAlgo.id,
serviceId: resolvedDDOAlgo.services[0].id, serviceId: resolvedDDOAlgo.services[0].id,
transferTxId: txidAlgo.transactionHash transferTxId: txidAlgo.transactionHash
} },
crossFetchGeneric
) )
assert(computeJobs, 'Cannot start compute job') assert(computeJobs, 'Cannot start compute job')
const jobStatus = await ProviderInstance.computeStatus( const jobStatus = await ProviderInstance.computeStatus(