From 7bb1432182dfc5ad8de271dd77b8924059657643 Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Wed, 27 Jul 2022 15:00:10 +0300 Subject: [PATCH 1/4] added logs --- test/integration/ComputeFlow.test.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index ffa0f4d1..c5690841 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -459,6 +459,7 @@ describe('Simple compute tests', async () => { providerUrl, consumerAccount ) + console.log('providerInitializeComputeResults =', providerInitializeComputeResults) assert( !('error' in providerInitializeComputeResults.algorithm), 'Cannot order algorithm' @@ -479,6 +480,8 @@ describe('Simple compute tests', async () => { 0 ) } + console.log(' asset =', assets[0]) + console.log(' algo =', assets[0]) const computeJobs = await ProviderInstance.computeStart( providerUrl, web3, From 044e33013d83093cdb7e5364b01213c174ba42f1 Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Wed, 27 Jul 2022 15:01:03 +0300 Subject: [PATCH 2/4] update response log --- test/integration/ComputeFlow.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index c5690841..a0ee7340 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -490,6 +490,7 @@ describe('Simple compute tests', async () => { assets[0], algo ) + console.log(' computeJobs response =', computeJobs) freeEnvDatasetTxId = assets[0].transferTxId freeEnvAlgoTxId = algo.transferTxId assert(computeJobs, 'Cannot start compute job') From 61477269db7f6f64e7aa9bdbd2ba261aab91d376 Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Thu, 11 Aug 2022 11:45:33 +0300 Subject: [PATCH 3/4] merge main, added logs, update container checksum --- test/integration/ComputeFlow.test.ts | 39 ++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index a0ee7340..f9ccbb91 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -176,7 +176,7 @@ const algoDdoWithNoTimeout = { image: 'ubuntu', tag: 'latest', checksum: - 'sha256:bace9fb0d5923a675c894d5c815da75ffe35e24970166a48a4460a48ae6e0d19' + 'sha256:d39ab4712a8395d0b399dea44d9cb8b34ac942411b6a380449ebdb9d321136a3' } } }, @@ -218,7 +218,7 @@ const algoDdoWith1mTimeout = { image: 'ubuntu', tag: 'latest', checksum: - 'sha256:bace9fb0d5923a675c894d5c815da75ffe35e24970166a48a4460a48ae6e0d19' + 'sha256:d39ab4712a8395d0b399dea44d9cb8b34ac942411b6a380449ebdb9d321136a3' } } }, @@ -481,20 +481,27 @@ describe('Simple compute tests', async () => { ) } console.log(' asset =', assets[0]) - console.log(' algo =', assets[0]) - const computeJobs = await ProviderInstance.computeStart( - providerUrl, - web3, - consumerAccount, - computeEnv.id, - assets[0], - algo - ) - console.log(' computeJobs response =', computeJobs) - freeEnvDatasetTxId = assets[0].transferTxId - freeEnvAlgoTxId = algo.transferTxId - assert(computeJobs, 'Cannot start compute job') - computeJobId = computeJobs[0].jobId + console.log(' algo =', algo) + console.log(' consumerAccount =', consumerAccount) + console.log(' computeEnv.id =', computeEnv.id) + try { + const computeJobs = await ProviderInstance.computeStart( + providerUrl, + web3, + consumerAccount, + computeEnv.id, + assets[0], + algo + ) + console.log(' computeJobs response =', computeJobs) + freeEnvDatasetTxId = assets[0].transferTxId + freeEnvAlgoTxId = algo.transferTxId + assert(computeJobs, 'Cannot start compute job') + computeJobId = computeJobs[0].jobId + } catch (error) { + console.log(' computeJobs error =', error) + console.log(' computeJobs error =', error.message) + } }) it('should restart a computeJob without paying anything, because order is valid and providerFees are still valid', async () => { From a41e2cf91f31336c8289e27c6a49ff4229733081 Mon Sep 17 00:00:00 2001 From: Bogdan Fazakas Date: Thu, 11 Aug 2022 11:57:25 +0300 Subject: [PATCH 4/4] use proper container checksum and removed logs --- test/integration/ComputeFlow.test.ts | 39 ++++++++++------------------ 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/test/integration/ComputeFlow.test.ts b/test/integration/ComputeFlow.test.ts index f9ccbb91..4a0198a0 100644 --- a/test/integration/ComputeFlow.test.ts +++ b/test/integration/ComputeFlow.test.ts @@ -176,7 +176,7 @@ const algoDdoWithNoTimeout = { image: 'ubuntu', tag: 'latest', checksum: - 'sha256:d39ab4712a8395d0b399dea44d9cb8b34ac942411b6a380449ebdb9d321136a3' + 'sha256:42ba2dfce475de1113d55602d40af18415897167d47c2045ec7b6d9746ff148f' } } }, @@ -218,7 +218,7 @@ const algoDdoWith1mTimeout = { image: 'ubuntu', tag: 'latest', checksum: - 'sha256:d39ab4712a8395d0b399dea44d9cb8b34ac942411b6a380449ebdb9d321136a3' + 'sha256:42ba2dfce475de1113d55602d40af18415897167d47c2045ec7b6d9746ff148f' } } }, @@ -459,7 +459,6 @@ describe('Simple compute tests', async () => { providerUrl, consumerAccount ) - console.log('providerInitializeComputeResults =', providerInitializeComputeResults) assert( !('error' in providerInitializeComputeResults.algorithm), 'Cannot order algorithm' @@ -480,28 +479,18 @@ describe('Simple compute tests', async () => { 0 ) } - console.log(' asset =', assets[0]) - console.log(' algo =', algo) - console.log(' consumerAccount =', consumerAccount) - console.log(' computeEnv.id =', computeEnv.id) - try { - const computeJobs = await ProviderInstance.computeStart( - providerUrl, - web3, - consumerAccount, - computeEnv.id, - assets[0], - algo - ) - console.log(' computeJobs response =', computeJobs) - freeEnvDatasetTxId = assets[0].transferTxId - freeEnvAlgoTxId = algo.transferTxId - assert(computeJobs, 'Cannot start compute job') - computeJobId = computeJobs[0].jobId - } catch (error) { - console.log(' computeJobs error =', error) - console.log(' computeJobs error =', error.message) - } + const computeJobs = await ProviderInstance.computeStart( + providerUrl, + web3, + consumerAccount, + computeEnv.id, + assets[0], + algo + ) + freeEnvDatasetTxId = assets[0].transferTxId + freeEnvAlgoTxId = algo.transferTxId + assert(computeJobs, 'Cannot start compute job') + computeJobId = computeJobs[0].jobId }) it('should restart a computeJob without paying anything, because order is valid and providerFees are still valid', async () => {