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

more customProvider code

Browse Source
This commit is contained in:
alexcos20 2020-09-19 00:14:02 -07:00
parent d10766d967
commit 67f6e16330
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ocean/Assets.ts
View File

@ -394,6 +394,7 @@ export class Assets extends Instantiable {
type: 'access', type: 'access',
index: 2, index: 2,
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
serviceEndpoint: customProvider || this.ocean.provider.url, serviceEndpoint: customProvider || this.ocean.provider.url,
======= =======
@ -404,6 +405,9 @@ export class Assets extends Instantiable {
? customProvider + this.ocean.provider.getConsumeEndpointShort() ? customProvider + this.ocean.provider.getConsumeEndpointShort()
: this.ocean.provider.getConsumeEndpoint(), : this.ocean.provider.getConsumeEndpoint(),
>>>>>>> 960e90f... extra checks >>>>>>> 960e90f... extra checks
=======
serviceEndpoint: customProvider || this.ocean.provider.url,
>>>>>>> 11b58cb... more customProvider code
attributes: { attributes: {
main: { main: {
creator: creator.getId(), creator: creator.getId(),

4
src/ocean/Compute.ts
View File

@ -94,7 +94,11 @@ export class Compute extends Instantiable {
if (did && txId) { if (did && txId) {
const provider = new Provider(this.instanceConfig) const provider = new Provider(this.instanceConfig)
provider.setBaseUrl(serviceEndpoint) provider.setBaseUrl(serviceEndpoint)
<<<<<<< HEAD
const computeJobsList = await provider.compute( const computeJobsList = await provider.compute(
=======
const computeJobsList = await this.ocean.provider.compute(
>>>>>>> 11b58cb... more customProvider code
'post', 'post',
did, did,
consumerAccount, consumerAccount,