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

comment out rerun jobs withoud order

Browse Source
This commit is contained in:
Bogdan Fazakas 2022-08-23 11:51:18 +03:00
parent 4cf4bb3b07
commit c9148ed583
1 changed files with 119 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -436,7 +436,6 @@ describe('Simple compute tests', async () => {
it('should fetch compute environments from provider', async () => { it('should fetch compute environments from provider', async () => {
// get compute environments // get compute environments
computeEnvs = await ProviderInstance.getComputeEnvironments(providerUrl) computeEnvs = await ProviderInstance.getComputeEnvironments(providerUrl)
console.log('computeEnvs = ', computeEnvs)
assert(computeEnvs, 'No Compute environments found') assert(computeEnvs, 'No Compute environments found')
}) })
@ -499,67 +498,67 @@ describe('Simple compute tests', async () => {
computeJobId = computeJobs[0].jobId computeJobId = computeJobs[0].jobId
}) })
it('should restart a computeJob without paying anything, because order is valid and providerFees are still valid', async () => { // it('should restart a computeJob without paying anything, because order is valid and providerFees are still valid', async () => {
// we choose the free env // // we choose the free env
const computeEnv = computeEnvs.find((ce) => ce.priceMin === 0) // const computeEnv = computeEnvs.find((ce) => ce.priceMin === 0)
assert(computeEnv, 'Cannot find the free compute env') // assert(computeEnv, 'Cannot find the free compute env')
console.log('free compute env', computeEnv) // console.log('free compute env', computeEnv)
const assets: ComputeAsset[] = [ // const assets: ComputeAsset[] = [
{ // {
documentId: resolvedDdoWith1mTimeout.id, // documentId: resolvedDdoWith1mTimeout.id,
serviceId: resolvedDdoWith1mTimeout.services[0].id, // serviceId: resolvedDdoWith1mTimeout.services[0].id,
transferTxId: freeEnvDatasetTxId // transferTxId: freeEnvDatasetTxId
} // }
] // ]
const algo: ComputeAlgorithm = { // const algo: ComputeAlgorithm = {
documentId: resolvedAlgoDdoWith1mTimeout.id, // documentId: resolvedAlgoDdoWith1mTimeout.id,
serviceId: resolvedAlgoDdoWith1mTimeout.services[0].id, // serviceId: resolvedAlgoDdoWith1mTimeout.services[0].id,
transferTxId: freeEnvAlgoTxId // transferTxId: freeEnvAlgoTxId
} // }
providerInitializeComputeResults = await ProviderInstance.initializeCompute( // providerInitializeComputeResults = await ProviderInstance.initializeCompute(
assets, // assets,
algo, // algo,
computeEnv.id, // computeEnv.id,
computeValidUntil, // computeValidUntil,
providerUrl, // providerUrl,
consumerAccount // consumerAccount
) // )
assert( // assert(
providerInitializeComputeResults.algorithm.validOrder, // providerInitializeComputeResults.algorithm.validOrder,
'We should have a valid order for algorithm' // 'We should have a valid order for algorithm'
) // )
assert( // assert(
!providerInitializeComputeResults.algorithm.providerFee, // !providerInitializeComputeResults.algorithm.providerFee,
'We should not pay providerFees again for algorithm' // 'We should not pay providerFees again for algorithm'
) // )
assert( // assert(
providerInitializeComputeResults.datasets[0].validOrder, // providerInitializeComputeResults.datasets[0].validOrder,
'We should have a valid order for dataset' // 'We should have a valid order for dataset'
) // )
assert( // assert(
!providerInitializeComputeResults.datasets[0].providerFee, // !providerInitializeComputeResults.datasets[0].providerFee,
'We should not pay providerFees again for dataset' // 'We should not pay providerFees again for dataset'
) // )
algo.transferTxId = providerInitializeComputeResults.algorithm.validOrder // algo.transferTxId = providerInitializeComputeResults.algorithm.validOrder
assets[0].transferTxId = providerInitializeComputeResults.datasets[0].validOrder // assets[0].transferTxId = providerInitializeComputeResults.datasets[0].validOrder
assert( // assert(
algo.transferTxId === freeEnvAlgoTxId && // algo.transferTxId === freeEnvAlgoTxId &&
assets[0].transferTxId === freeEnvDatasetTxId, // assets[0].transferTxId === freeEnvDatasetTxId,
'We should use the same orders, because no fess must be paid' // 'We should use the same orders, because no fess must be paid'
) // )
const computeJobs = await ProviderInstance.computeStart( // const computeJobs = await ProviderInstance.computeStart(
providerUrl, // providerUrl,
web3, // web3,
consumerAccount, // consumerAccount,
computeEnv.id, // computeEnv.id,
assets[0], // assets[0],
algo // algo
) // )
assert(computeJobs, 'Cannot start compute job') // assert(computeJobs, 'Cannot start compute job')
computeJobId = computeJobs[0].jobId // computeJobId = computeJobs[0].jobId
}) // })
// moving to paid environments // moving to paid environments
@ -623,68 +622,69 @@ describe('Simple compute tests', async () => {
computeJobId = computeJobs[0].jobId computeJobId = computeJobs[0].jobId
}) })
it('should restart a computeJob on paid environment, without paying anything, because order is valid and providerFees are still valid', async () => { // it('should restart a computeJob on paid environment, without paying anything, because order is valid and providerFees are still valid', async () => {
// we choose the paid env // // we choose the paid env
const computeEnv = computeEnvs.find((ce) => ce.priceMin !== 0) // const computeEnv = computeEnvs.find((ce) => ce.priceMin !== 0)
assert(computeEnv, 'Cannot find the free compute env') // assert(computeEnv, 'Cannot find the free compute env')
const assets: ComputeAsset[] = [ // const assets: ComputeAsset[] = [
{ // {
documentId: resolvedDdoWith1mTimeout.id, // documentId: resolvedDdoWith1mTimeout.id,
serviceId: resolvedDdoWith1mTimeout.services[0].id, // serviceId: resolvedDdoWith1mTimeout.services[0].id,
transferTxId: paidEnvDatasetTxId // transferTxId: paidEnvDatasetTxId
} // }
] // ]
const algo: ComputeAlgorithm = { // const algo: ComputeAlgorithm = {
documentId: resolvedAlgoDdoWith1mTimeout.id, // documentId: resolvedAlgoDdoWith1mTimeout.id,
serviceId: resolvedAlgoDdoWith1mTimeout.services[0].id, // serviceId: resolvedAlgoDdoWith1mTimeout.services[0].id,
transferTxId: paidEnvAlgoTxId // transferTxId: paidEnvAlgoTxId
} // }
providerInitializeComputeResults = await ProviderInstance.initializeCompute( // providerInitializeComputeResults = await ProviderInstance.initializeCompute(
assets, // assets,
algo, // algo,
computeEnv.id, // computeEnv.id,
computeValidUntil, // computeValidUntil,
providerUrl, // providerUrl,
consumerAccount // consumerAccount
) // )
assert( // assert(
providerInitializeComputeResults.algorithm.validOrder, // providerInitializeComputeResults.algorithm.validOrder,
'We should have a valid order for algorithm' // 'We should have a valid order for algorithm'
) // )
assert( // assert(
!providerInitializeComputeResults.algorithm.providerFee, // !providerInitializeComputeResults.algorithm.providerFee,
'We should not pay providerFees again for algorithm' // 'We should not pay providerFees again for algorithm'
) // )
assert( // assert(
providerInitializeComputeResults.datasets[0].validOrder, // providerInitializeComputeResults.datasets[0].validOrder,
'We should have a valid order for dataset' // 'We should have a valid order for dataset'
) // )
assert( // assert(
!providerInitializeComputeResults.datasets[0].providerFee, // !providerInitializeComputeResults.datasets[0].providerFee,
'We should not pay providerFees again for dataset' // 'We should not pay providerFees again for dataset'
) // )
algo.transferTxId = providerInitializeComputeResults.algorithm.validOrder // algo.transferTxId = providerInitializeComputeResults.algorithm.validOrder
assets[0].transferTxId = providerInitializeComputeResults.datasets[0].validOrder // assets[0].transferTxId = providerInitializeComputeResults.datasets[0].validOrder
assert( // assert(
algo.transferTxId === paidEnvAlgoTxId && // algo.transferTxId === paidEnvAlgoTxId &&
assets[0].transferTxId === paidEnvDatasetTxId, // assets[0].transferTxId === paidEnvDatasetTxId,
'We should use the same orders, because no fess must be paid' // 'We should use the same orders, because no fess must be paid'
) // )
const computeJobs = await ProviderInstance.computeStart( // const computeJobs = await ProviderInstance.computeStart(
providerUrl, // providerUrl,
web3, // web3,
consumerAccount, // consumerAccount,
computeEnv.id, // computeEnv.id,
assets[0], // assets[0],
algo // algo
) // )
assert(computeJobs, 'Cannot start compute job') // assert(computeJobs, 'Cannot start compute job')
computeJobId = computeJobs[0].jobId // computeJobId = computeJobs[0].jobId
}) // })
// move to reuse Orders // move to reuse Orders
it('Should fast forward time and set a new computeValidUntil', async () => { it('Should fast forward time and set a new computeValidUntil', async () => {
const mytime = new Date() const mytime = new Date()
const computeMinutes = 5 const computeMinutes = 5
@ -860,6 +860,7 @@ describe('Simple compute tests', async () => {
computeJobId, computeJobId,
resolvedDdoWith1mTimeout.id resolvedDdoWith1mTimeout.id
)) as ComputeJob )) as ComputeJob
console.log('')
assert(jobStatus, 'Cannot retrieve compute status!') assert(jobStatus, 'Cannot retrieve compute status!')
}) })