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

update startOrder in consume and compute integration tests

Browse Source
This commit is contained in:
Bogdan Fazakas 2022-01-19 23:18:31 +02:00
parent 8c9e21f309
commit 555bdf583d
2 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/integration/ComputeFlow.test.ts
View File

@ -13,6 +13,7 @@ import { homedir } from 'os'
import fs from 'fs'
import { downloadFile, crossFetchGeneric } from '../../src/utils/FetchHelper'
import console from 'console'
import { ProviderFees } from '../../src/@types'
const data = JSON.parse(
fs.readFileSync(
@ -258,19 +259,24 @@ describe('Simple compute tests', async () => {
providerUrl,
crossFetchGeneric
)
const providerAlgoFees: ProviderFees = {
providerFeeAddress: initializeDataAlgo.providerFee.providerFeeAddress,
providerFeeToken: initializeDataAlgo.providerFee.providerFeeToken,
providerFeeAmount: initializeDataAlgo.providerFee.providerFeeAmount,
v: initializeDataAlgo.providerFee.v,
r: initializeDataAlgo.providerFee.r,
s: initializeDataAlgo.providerFee.s,
providerData: initializeDataAlgo.providerFee.providerData,
validUntil: initializeDataAlgo.providerFee.validUntil
}
// make the payment
const txidAlgo = await datatoken.startOrder(
datatokenAddressAlgo,
consumerAccount,
initializeDataAlgo.computeAddress,
0,
initializeDataAlgo.providerFee.providerFeeAddress,
initializeDataAlgo.providerFee.providerFeeToken,
initializeDataAlgo.providerFee.providerFeeAmount,
initializeDataAlgo.providerFee.v,
initializeDataAlgo.providerFee.r,
initializeDataAlgo.providerFee.s,
initializeDataAlgo.providerFee.providerData
providerAlgoFees
)
assert(txidAlgo, 'Failed to order algo')
// initialize provider orders for asset
@ -284,19 +290,23 @@ describe('Simple compute tests', async () => {
null,
'env1'
)
const providerDatasetFees: ProviderFees = {
providerFeeAddress: initializeData.providerFee.providerFeeAddress,
providerFeeToken: initializeData.providerFee.providerFeeToken,
providerFeeAmount: initializeData.providerFee.providerFeeAmount,
v: initializeData.providerFee.v,
r: initializeData.providerFee.r,
s: initializeData.providerFee.s,
providerData: initializeData.providerFee.providerData,
validUntil: initializeData.providerFee.validUntil
}
// make the payment
const txidAsset = await datatoken.startOrder(
datatokenAddressAsset,
consumerAccount,
initializeDataAlgo.computeAddress,
0,
initializeData.providerFee.providerFeeAddress,
initializeData.providerFee.providerFeeToken,
initializeData.providerFee.providerFeeAmount,
initializeData.providerFee.v,
initializeData.providerFee.r,
initializeData.providerFee.s,
initializeData.providerFee.providerData
providerDatasetFees
)
assert(txidAsset, 'Failed to order algo')
// start the compute job

19
test/integration/SimplePublishConsumeFlow.test.ts
View File

@ -12,6 +12,7 @@ import { homedir } from 'os'
import fs from 'fs'
import { downloadFile, crossFetchGeneric } from '../../src/utils/FetchHelper'
import console from 'console'
import { ProviderFees } from '../../src/@types/Provider'
const data = JSON.parse(
fs.readFileSync(
@ -135,19 +136,23 @@ describe('Simple Publish & consume test', async () => {
providerUrl,
crossFetchGeneric
)
const providerFees: ProviderFees = {
providerFeeAddress: initializeData.providerFee.providerFeeAddress,
providerFeeToken: initializeData.providerFee.providerFeeToken,
providerFeeAmount: initializeData.providerFee.providerFeeAmount,
v: initializeData.providerFee.v,
r: initializeData.providerFee.r,
s: initializeData.providerFee.s,
providerData: initializeData.providerFee.providerData,
validUntil: initializeData.providerFee.validUntil
}
// make the payment
const txid = await datatoken.startOrder(
datatokenAddress,
consumerAccount,
consumerAccount,
0,
initializeData.providerFee.providerFeeAddress,
initializeData.providerFee.providerFeeToken,
initializeData.providerFee.providerFeeAmount,
initializeData.providerFee.v,
initializeData.providerFee.r,
initializeData.providerFee.s,
initializeData.providerFee.providerData
providerFees
)
// get the url
const downloadURL = await ProviderInstance.getDownloadUrl(