1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

Merge pull request #157 from oceanprotocol/feature/cleanup-test

feature/cleanup-test
This commit is contained in:
Ahmed Ali 2020-07-15 12:35:45 +02:00 committed by GitHub
commit b9891bf4bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3,12 +3,7 @@ import { DataTokens } from '../../src/datatokens/Datatokens'
import { Ocean } from '../../src/ocean/Ocean' import { Ocean } from '../../src/ocean/Ocean'
import config from './config' import config from './config'
import { assert } from 'console' import { assert } from 'console'
import { ComputeJob } from '../../src/ocean/interfaces/ComputeJob' import { ServiceComputePrivacy } from '../../src/ddo/interfaces/Service'
import {
Service,
ServiceComputePrivacy,
ServiceCompute
} from '../../src/ddo/interfaces/Service'
const Web3 = require('web3') const Web3 = require('web3')
const web3 = new Web3('http://127.0.0.1:8545') const web3 = new Web3('http://127.0.0.1:8545')
const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json') const factory = require('@oceanprotocol/contracts/artifacts/development/Factory.json')
@ -23,11 +18,9 @@ describe('Compute flow', () => {
let datasetNoRawAlgo let datasetNoRawAlgo
let datasetWithTrustedAlgo let datasetWithTrustedAlgo
let algorithmAsset let algorithmAsset
let marketplace
let contracts let contracts
let datatoken let datatoken
let tokenAddress let tokenAddress
let service1
let price let price
let ocean let ocean
let computeService let computeService
@ -42,7 +35,6 @@ describe('Compute flow', () => {
const dateCreated = new Date(Date.now()).toISOString().split('.')[0] + 'Z' // remove milliseconds const dateCreated = new Date(Date.now()).toISOString().split('.')[0] + 'Z' // remove milliseconds
const marketplaceAllowance = 20
const tokenAmount = 100 const tokenAmount = 100
const timeout = 86400 const timeout = 86400
@ -73,7 +65,6 @@ describe('Compute flow', () => {
owner = (await ocean.accounts.list())[0] owner = (await ocean.accounts.list())[0]
alice = (await ocean.accounts.list())[1] alice = (await ocean.accounts.list())[1]
bob = (await ocean.accounts.list())[2] bob = (await ocean.accounts.list())[2]
marketplace = (await ocean.accounts.list())[3]
data = { t: 1, url: ocean.config.metadataStoreUri } data = { t: 1, url: ocean.config.metadataStoreUri }
blob = JSON.stringify(data) blob = JSON.stringify(data)
await contracts.deployContracts(owner.getId()) await contracts.deployContracts(owner.getId())