From 8297808f55ea47f5c74671a773b8d247c674cf67 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 15 Jul 2020 12:01:02 +0200 Subject: [PATCH 1/3] Cleanup style issues/warnings in compute test. --- test/integration/ComputeFlow.test.ts | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index 4b43a6e8..e69eb674 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -3,12 +3,7 @@ import { DataTokens } from '../../src/datatokens/Datatokens' import { Ocean } from '../../src/ocean/Ocean' import config from './config' import { assert } from 'console' -import { ComputeJob } from '../../src/ocean/interfaces/ComputeJob' -import { - Service, - ServiceComputePrivacy, - ServiceCompute -} from '../../src/ddo/interfaces/Service' +import { ServiceComputePrivacy } from '../../src/ddo/interfaces/Service' const Web3 = require('web3') const web3 = new Web3('http://127.0.0.1:8545') const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') @@ -23,11 +18,9 @@ describe('Compute flow', () => { let datasetNoRawAlgo let datasetWithTrustedAlgo let algorithmAsset - let marketplace let contracts let datatoken let tokenAddress - let service1 let price let ocean let computeService @@ -42,7 +35,6 @@ describe('Compute flow', () => { const dateCreated = new Date(Date.now()).toISOString().split('.')[0] + 'Z' // remove milliseconds - const marketplaceAllowance = 20 const tokenAmount = 100 const timeout = 86400 @@ -73,7 +65,7 @@ describe('Compute flow', () => { owner = (await ocean.accounts.list())[0] alice = (await ocean.accounts.list())[1] bob = (await ocean.accounts.list())[2] - marketplace = (await ocean.accounts.list())[3] + (await ocean.accounts.list())[3] data = { t: 1, url: ocean.config.metadataStoreUri } blob = JSON.stringify(data) await contracts.deployContracts(owner.getId()) From 33b4076cffa6e45f1ed5faba1646ff40a847374b Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 15 Jul 2020 12:12:46 +0200 Subject: [PATCH 2/3] Fix test. --- test/integration/ComputeFlow.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index e69eb674..77a86858 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -65,7 +65,6 @@ describe('Compute flow', () => { owner = (await ocean.accounts.list())[0] alice = (await ocean.accounts.list())[1] bob = (await ocean.accounts.list())[2] - (await ocean.accounts.list())[3] data = { t: 1, url: ocean.config.metadataStoreUri } blob = JSON.stringify(data) await contracts.deployContracts(owner.getId()) From a302be751dae3c6074c8f432911437f9a1d34911 Mon Sep 17 00:00:00 2001 From: ssallam Date: Wed, 15 Jul 2020 12:13:37 +0200 Subject: [PATCH 3/3] Use `latest` provider tag in travis setup. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0e670ddc..bdd83b56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ before_script: - git clone https://github.com/oceanprotocol/barge - cd barge - git checkout v3 - - export PROVIDER_VERSION=phase2 + - export PROVIDER_VERSION=latest - bash -x start_ocean.sh --no-dashboard 2>&1 > start_ocean.log & - cd .. - sleep 300