oceanprotocol/squid-js
1
0
Fork 0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Code Releases Activity

Merge pull request #413 from oceanprotocol/fix/timeouts

Browse Source 
fix timeouts
This commit is contained in:
Matthias Kretschmann 2020-05-18 10:40:54 +02:00 committed by GitHub
commit 5a15d3dc59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -24,7 +24,7 @@ before_script:
- git clone https://github.com/oceanprotocol/barge - git clone https://github.com/oceanprotocol/barge
- cd barge - cd barge
- export AQUARIUS_VERSION=unstable - export AQUARIUS_VERSION=unstable
- export BRIZO_VERSION=v0.9.5 - export BRIZO_VERSION=v0.9.7
- export KEEPER_VERSION=v0.13.2 - export KEEPER_VERSION=v0.13.2
- export EVENTS_HANDLER_VERSION=v0.4.7 - export EVENTS_HANDLER_VERSION=v0.4.7
- export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260" - export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"

5
src/ocean/OceanAssets.ts
View File

@ -477,7 +477,8 @@ export class OceanAssets extends Instantiable {
public async createAccessServiceAttributes( public async createAccessServiceAttributes(
consumerAccount: Account, consumerAccount: Account,
price: string, price: string,
datePublished: string datePublished: string,
timeout: number = 0
): Promise<ServiceAccess> { ): Promise<ServiceAccess> {
const { templates } = this.ocean.keeper const { templates } = this.ocean.keeper
const serviceAgreementTemplate = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplate() const serviceAgreementTemplate = await templates.escrowAccessSecretStoreTemplate.getServiceAgreementTemplate()
@ -491,7 +492,7 @@ export class OceanAssets extends Instantiable {
creator: consumerAccount.getId(), creator: consumerAccount.getId(),
datePublished, datePublished,
price, price,
timeout: 3600, timeout: timeout,
name: 'dataAssetAccessServiceAgreement' name: 'dataAssetAccessServiceAgreement'
}, },
serviceAgreementTemplate serviceAgreementTemplate

5
src/ocean/OceanCompute.ts
View File

@ -266,7 +266,8 @@ export class OceanCompute extends Instantiable {
public async createComputeServiceAttributes( public async createComputeServiceAttributes(
consumerAccount: Account, consumerAccount: Account,
price: string, price: string,
datePublished: string datePublished: string,
timeout: number = 3600
): Promise<ServiceCompute> { ): Promise<ServiceCompute> {
const { templates } = this.ocean.keeper const { templates } = this.ocean.keeper
const serviceAgreementTemplate = await templates.escrowComputeExecutionTemplate.getServiceAgreementTemplate() const serviceAgreementTemplate = await templates.escrowComputeExecutionTemplate.getServiceAgreementTemplate()
@ -281,7 +282,7 @@ export class OceanCompute extends Instantiable {
creator: consumerAccount.getId(), creator: consumerAccount.getId(),
datePublished, datePublished,
price, price,
timeout: 3600, timeout: timeout,
name name
}, },
serviceAgreementTemplate serviceAgreementTemplate