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

extra checks

Browse Source
This commit is contained in:
alexcos20 2020-09-16 06:44:01 -07:00
parent 20493dfca4
commit d10766d967
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ocean/Assets.ts
View File

@ -393,11 +393,17 @@ export class Assets extends Instantiable {
return { return {
type: 'access', type: 'access',
index: 2, index: 2,
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
serviceEndpoint: customProvider || this.ocean.provider.url, serviceEndpoint: customProvider || this.ocean.provider.url,
======= =======
serviceEndpoint: customProvider || this.ocean.provider.getConsumeEndpoint(), serviceEndpoint: customProvider || this.ocean.provider.getConsumeEndpoint(),
>>>>>>> 17e61d0... allow customProvider on publish >>>>>>> 17e61d0... allow customProvider on publish
=======
serviceEndpoint: customProvider
? customProvider + this.ocean.provider.getConsumeEndpointShort()
: this.ocean.provider.getConsumeEndpoint(),
>>>>>>> 960e90f... extra checks
attributes: { attributes: {
main: { main: {
creator: creator.getId(), creator: creator.getId(),

6
src/ocean/Compute.ts
View File

@ -293,6 +293,7 @@ export class Compute extends Instantiable {
const service = { const service = {
type: 'compute', type: 'compute',
index: 3, index: 3,
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
serviceEndpoint: customProvider serviceEndpoint: customProvider
? customProvider + this.ocean.provider.getComputeEndpointShort() ? customProvider + this.ocean.provider.getComputeEndpointShort()
@ -300,6 +301,11 @@ export class Compute extends Instantiable {
======= =======
serviceEndpoint: customProvider || this.ocean.provider.getComputeEndpoint(), serviceEndpoint: customProvider || this.ocean.provider.getComputeEndpoint(),
>>>>>>> 17e61d0... allow customProvider on publish >>>>>>> 17e61d0... allow customProvider on publish
=======
serviceEndpoint: customProvider
? customProvider + this.ocean.provider.getComputeEndpointShort()
: this.ocean.provider.getComputeEndpoint(),
>>>>>>> 960e90f... extra checks
attributes: { attributes: {
main: { main: {
name, name,