From 172967c35290f5843ffaa1ad1e3c872006f6faf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Guti=C3=A9rrez?= Date: Wed, 29 May 2019 15:52:35 +0200 Subject: [PATCH] Fix integration tests. --- .travis.yml | 4 ++-- integration/ocean/AssetOwners.test.ts | 2 +- integration/ocean/ConsumeAssetBrizo.test.ts | 2 +- integration/utils/ddo-metadata-generator.ts | 11 ++++++----- .../conditions/AccessSecretStoreCondition.ts | 2 +- .../templates/EscrowAccessSecretStoreTemplate.ts | 10 ++++++++-- src/utils/DDOHelpers.ts | 4 ++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f3f4fd..b986662 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,8 @@ before_script: - ganache-cli --port 18545 > ganache-cli.log & - git clone https://github.com/oceanprotocol/barge - cd barge - - export AQUARIUS_VERSION=v0.2.2 - - export BRIZO_VERSION=v0.3.6 + - export AQUARIUS_VERSION=v0.2.7 + - export BRIZO_VERSION=v0.3.9 - export KEEPER_VERSION=v0.9.7 - export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260" - bash -x start_ocean.sh --latest --no-pleuston --local-spree-node 2>&1 > start_ocean.log & diff --git a/integration/ocean/AssetOwners.test.ts b/integration/ocean/AssetOwners.test.ts index e128e54..aafd1c2 100644 --- a/integration/ocean/AssetOwners.test.ts +++ b/integration/ocean/AssetOwners.test.ts @@ -53,7 +53,7 @@ describe("Asset Owners", () => { assert.equal(finalLength1 - initialLength, 0) // Granting access - await account2.requestTokens(metadata.base.price) + await account2.requestTokens(+metadata.base.price * (10 ** -await ocean.keeper.token.decimals())) await ocean.assets.order(ddo.id, ddo.findServiceByType("Access").serviceDefinitionId, account2) // Access granted diff --git a/integration/ocean/ConsumeAssetBrizo.test.ts b/integration/ocean/ConsumeAssetBrizo.test.ts index 6f50886..9dfcdf7 100644 --- a/integration/ocean/ConsumeAssetBrizo.test.ts +++ b/integration/ocean/ConsumeAssetBrizo.test.ts @@ -34,7 +34,7 @@ describe("Consume Asset (Brizo)", () => { it("should order the asset", async () => { const accessService = ddo.findServiceByType("Access") - await consumer.requestTokens(metadata.base.price) + await consumer.requestTokens(+metadata.base.price * (10 ** -await ocean.keeper.token.decimals())) const steps = [] agreementId = await ocean.assets.order(ddo.id, accessService.serviceDefinitionId, consumer) diff --git a/integration/utils/ddo-metadata-generator.ts b/integration/utils/ddo-metadata-generator.ts index 3b8ee35..1f29dfd 100644 --- a/integration/utils/ddo-metadata-generator.ts +++ b/integration/utils/ddo-metadata-generator.ts @@ -13,13 +13,14 @@ const metadata: Partial = { workExample: "423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68", links: [ { - sample1: "http://data.ceda.ac.uk/badc/ukcp09/data/gridded-land-obs/gridded-land-obs-daily/", + name: "Sample of Asset Data", + type: "sample", + url: "https://foo.com/sample.csv", }, { - sample2: "http://data.ceda.ac.uk/badc/ukcp09/data/gridded-land-obs/gridded-land-obs-averages-25km/", - }, - { - fieldsDescription: "http://data.ceda.ac.uk/badc/ukcp09/", + name: "Data Format Definition", + type: "format", + url: "https://foo.com/sample.csv", }, ], inLanguage: "en", diff --git a/src/keeper/contracts/conditions/AccessSecretStoreCondition.ts b/src/keeper/contracts/conditions/AccessSecretStoreCondition.ts index 1b27b82..4e09cd9 100644 --- a/src/keeper/contracts/conditions/AccessSecretStoreCondition.ts +++ b/src/keeper/contracts/conditions/AccessSecretStoreCondition.ts @@ -20,7 +20,7 @@ export class AccessSecretStoreCondition extends Condition { return this.call("checkPermissions", [grantee, didZeroX(did)].map(zeroX), from) } - public async getGrantedDidByConsumer(consumer: string): Promise<{did: string, agreementId: string}[]> { + public async getGrantedDidByConsumer(consumer: string): Promise> { return (await this.getPastEvents("Fulfilled", {_grantee: zeroX(consumer)})) .map(({returnValues}) => ({ did: didPrefixed(returnValues._documentId), diff --git a/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts b/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts index 10250b5..a19408a 100644 --- a/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts +++ b/src/keeper/contracts/templates/EscrowAccessSecretStoreTemplate.ts @@ -69,8 +69,14 @@ export class EscrowAccessSecretStoreTemplate extends AgreementTemplate { * @param {string} from Consumer address. * @return {Promise} Agreement ID. */ - public async createFullAgreement(did: string, amount: number | string, consumer: string, from?: string, agreementId?: string): Promise { - agreementId = agreementId || generateId() + public async createFullAgreement( + did: string, + amount: number | string, + consumer: string, + from?: string, + agreementId: string = generateId(), + ): Promise { + const {accessSecretStoreConditionId, lockRewardConditionId, escrowRewardId} = await this.createFullAgreementData(agreementId, did, amount, consumer) diff --git a/src/utils/DDOHelpers.ts b/src/utils/DDOHelpers.ts index 1f41c2c..2ee3925 100644 --- a/src/utils/DDOHelpers.ts +++ b/src/utils/DDOHelpers.ts @@ -6,7 +6,7 @@ function fillParameterWithDDO(parameter: ServiceAgreementTemplateParameter, ddo: switch (name) { case "amount": case "price": - return ddo.findServiceByType("Metadata").metadata.base.price.toString() + return String(ddo.findServiceByType("Metadata").metadata.base.price) case "assetId": case "documentId": case "documentKeyId": @@ -19,7 +19,7 @@ function fillParameterWithDDO(parameter: ServiceAgreementTemplateParameter, ddo: } const value = getValue(parameter.name.replace(/^_/, "")) - return {...parameter, value: parameter.type.includes("int") ? Number(value) : value} + return {...parameter, value} } /**