11import { describe , expect , it , jest , beforeAll } from '@jest/globals' ;
2+ import { DATASET_INFINITE_VOLUME } from 'iexec/utils' ;
23import { ValidationError } from 'yup' ;
34import { PrepareBulkRequest } from '../../../src/lib/dataProtectorCore/prepareBulkRequest.js' ;
45import {
@@ -12,11 +13,11 @@ import {
1213} from '../../test-utils.js' ;
1314
1415// Mock bulk orders for testing
15- const mockBulkOrders = [
16+ const mockBulkAccesses = [
1617 {
1718 dataset : getRandomAddress ( ) ,
18- datasetprice : '1000000000000000000 ' , // 1 RLC in wei
19- volume : '10' ,
19+ datasetprice : '0 ' , // 1 RLC in wei
20+ volume : DATASET_INFINITE_VOLUME . toString ( ) ,
2021 tag : '0x0000000000000000000000000000000000000000000000000000000000000000' ,
2122 apprestrict : '0x0000000000000000000000000000000000000000' ,
2223 workerpoolrestrict : '0x0000000000000000000000000000000000000000' ,
@@ -27,8 +28,8 @@ const mockBulkOrders = [
2728 } ,
2829 {
2930 dataset : getRandomAddress ( ) ,
30- datasetprice : '2000000000000000000 ' , // 2 RLC in wei
31- volume : '5' ,
31+ datasetprice : '0 ' , // 2 RLC in wei
32+ volume : DATASET_INFINITE_VOLUME . toString ( ) ,
3233 tag : '0x0000000000000000000000000000000000000000000000000000000000000000' ,
3334 apprestrict : '0x0000000000000000000000000000000000000000' ,
3435 workerpoolrestrict : '0x0000000000000000000000000000000000000000' ,
@@ -86,41 +87,39 @@ describe('prepareBulkRequest', () => {
8687 } ) ;
8788
8889 describe ( 'Check validation for input parameters' , ( ) => {
89- describe ( 'When bulkOrders is NOT given' , ( ) => {
90+ describe ( 'When bulkAccesses is NOT given' , ( ) => {
9091 it ( 'should throw an error with the correct message' , async ( ) => {
9192 // --- GIVEN
92- const missingBulkOrders = undefined ;
93+ const missingBulkAccesses = undefined ;
9394
9495 await expect (
9596 // --- WHEN
9697 prepareBulkRequest ( {
9798 // @ts -expect-error No need for iexec here
9899 iexec : { } ,
99- bulkOrders : missingBulkOrders ,
100+ bulkAccesses : missingBulkAccesses ,
100101 app : getRandomAddress ( ) ,
101- maxProtectedDataPerTask : 1 ,
102102 } )
103103 // --- THEN
104- ) . rejects . toThrow ( 'bulkOrders is required and must not be empty' ) ;
104+ ) . rejects . toThrow ( 'bulkAccesses is required and must not be empty' ) ;
105105 } ) ;
106106 } ) ;
107107
108- describe ( 'When bulkOrders is empty' , ( ) => {
108+ describe ( 'When bulkAccesses is empty' , ( ) => {
109109 it ( 'should throw an error with the correct message' , async ( ) => {
110110 // --- GIVEN
111- const emptyBulkOrders : any [ ] = [ ] ;
111+ const emptyBulkAccesses : any [ ] = [ ] ;
112112
113113 await expect (
114114 // --- WHEN
115115 prepareBulkRequest ( {
116116 // @ts -expect-error No need for iexec here
117117 iexec : { } ,
118- bulkOrders : emptyBulkOrders ,
118+ bulkAccesses : emptyBulkAccesses ,
119119 app : getRandomAddress ( ) ,
120- maxProtectedDataPerTask : 1 ,
121120 } )
122121 // --- THEN
123- ) . rejects . toThrow ( 'bulkOrders is required and must not be empty' ) ;
122+ ) . rejects . toThrow ( 'bulkAccesses is required and must not be empty' ) ;
124123 } ) ;
125124 } ) ;
126125
@@ -134,9 +133,8 @@ describe('prepareBulkRequest', () => {
134133 prepareBulkRequest ( {
135134 // @ts -expect-error No need for iexec here
136135 iexec : { } ,
137- bulkOrders : mockBulkOrders ,
136+ bulkAccesses : mockBulkAccesses ,
138137 app : missingAppAddress ,
139- maxProtectedDataPerTask : 1 ,
140138 } )
141139 // --- THEN
142140 ) . rejects . toThrow ( new ValidationError ( getRequiredFieldMessage ( 'app' ) ) ) ;
@@ -153,9 +151,8 @@ describe('prepareBulkRequest', () => {
153151 prepareBulkRequest ( {
154152 // @ts -expect-error No need for iexec here
155153 iexec : { } ,
156- bulkOrders : mockBulkOrders ,
154+ bulkAccesses : mockBulkAccesses ,
157155 app : invalidAppAddress ,
158- maxProtectedDataPerTask : 1 ,
159156 } )
160157 // --- THEN
161158 ) . rejects . toThrow (
@@ -164,29 +161,6 @@ describe('prepareBulkRequest', () => {
164161 } ) ;
165162 } ) ;
166163
167- describe ( 'When maxProtectedDataPerTask is NOT given' , ( ) => {
168- it ( 'should throw a yup ValidationError with the correct message' , async ( ) => {
169- // --- GIVEN
170- const missingMaxProtectedDataPerTask = undefined ;
171-
172- await expect (
173- // --- WHEN
174- prepareBulkRequest ( {
175- // @ts -expect-error No need for iexec here
176- iexec : { } ,
177- bulkOrders : mockBulkOrders ,
178- app : getRandomAddress ( ) ,
179- maxProtectedDataPerTask : missingMaxProtectedDataPerTask ,
180- } )
181- // --- THEN
182- ) . rejects . toThrow (
183- new ValidationError (
184- getRequiredFieldMessage ( 'maxProtectedDataPerTask' )
185- )
186- ) ;
187- } ) ;
188- } ) ;
189-
190164 describe ( 'When maxProtectedDataPerTask is not a positive number' , ( ) => {
191165 it ( 'should throw a yup ValidationError with the correct message' , async ( ) => {
192166 // --- GIVEN
@@ -197,7 +171,7 @@ describe('prepareBulkRequest', () => {
197171 prepareBulkRequest ( {
198172 // @ts -expect-error No need for iexec here
199173 iexec : { } ,
200- bulkOrders : mockBulkOrders ,
174+ bulkAccesses : mockBulkAccesses ,
201175 app : getRandomAddress ( ) ,
202176 maxProtectedDataPerTask : invalidMaxProtectedDataPerTask ,
203177 } )
@@ -220,9 +194,8 @@ describe('prepareBulkRequest', () => {
220194 prepareBulkRequest ( {
221195 // @ts -expect-error No need for iexec here
222196 iexec : { } ,
223- bulkOrders : mockBulkOrders ,
197+ bulkAccesses : mockBulkAccesses ,
224198 app : getRandomAddress ( ) ,
225- maxProtectedDataPerTask : 1 ,
226199 appMaxPrice : invalidAppMaxPrice ,
227200 } )
228201 // --- THEN
@@ -242,9 +215,8 @@ describe('prepareBulkRequest', () => {
242215 prepareBulkRequest ( {
243216 // @ts -expect-error No need for iexec here
244217 iexec : { } ,
245- bulkOrders : mockBulkOrders ,
218+ bulkAccesses : mockBulkAccesses ,
246219 app : getRandomAddress ( ) ,
247- maxProtectedDataPerTask : 1 ,
248220 workerpoolMaxPrice : invalidWorkerpoolMaxPrice ,
249221 } )
250222 // --- THEN
@@ -266,9 +238,8 @@ describe('prepareBulkRequest', () => {
266238 prepareBulkRequest ( {
267239 // @ts -expect-error No need for iexec here
268240 iexec : { } ,
269- bulkOrders : mockBulkOrders ,
241+ bulkAccesses : mockBulkAccesses ,
270242 app : getRandomAddress ( ) ,
271- maxProtectedDataPerTask : 1 ,
272243 // @ts -expect-error explicitly invalid args
273244 args : invalidArgs ,
274245 } )
@@ -287,9 +258,8 @@ describe('prepareBulkRequest', () => {
287258 prepareBulkRequest ( {
288259 // @ts -expect-error No need for iexec here
289260 iexec : { } ,
290- bulkOrders : mockBulkOrders ,
261+ bulkAccesses : mockBulkAccesses ,
291262 app : getRandomAddress ( ) ,
292- maxProtectedDataPerTask : 1 ,
293263 inputFiles : invalidInputFiles ,
294264 } )
295265 // --- THEN
@@ -307,9 +277,8 @@ describe('prepareBulkRequest', () => {
307277 prepareBulkRequest ( {
308278 // @ts -expect-error No need for iexec here
309279 iexec : { } ,
310- bulkOrders : mockBulkOrders ,
280+ bulkAccesses : mockBulkAccesses ,
311281 app : getRandomAddress ( ) ,
312- maxProtectedDataPerTask : 1 ,
313282 // @ts -expect-error explicitly invalid secrets
314283 secrets : invalidSecrets ,
315284 } )
@@ -332,9 +301,8 @@ describe('prepareBulkRequest', () => {
332301 prepareBulkRequest ( {
333302 // @ts -expect-error No need for iexec here
334303 iexec : { } ,
335- bulkOrders : mockBulkOrders ,
304+ bulkAccesses : mockBulkAccesses ,
336305 app : getRandomAddress ( ) ,
337- maxProtectedDataPerTask : 1 ,
338306 workerpool : invalidWorkerpool ,
339307 } )
340308 // --- THEN
@@ -357,9 +325,8 @@ describe('prepareBulkRequest', () => {
357325 prepareBulkRequest ( {
358326 // @ts -expect-error No need for iexec here
359327 iexec : { } ,
360- bulkOrders : mockBulkOrders ,
328+ bulkAccesses : mockBulkAccesses ,
361329 app : getRandomAddress ( ) ,
362- maxProtectedDataPerTask : 1 ,
363330 encryptResult,
364331 pemPrivateKey,
365332 } )
@@ -376,9 +343,9 @@ describe('prepareBulkRequest', () => {
376343 it ( 'should throw a WorkflowError with the correct message' , async ( ) => {
377344 // --- GIVEN
378345 const validWhitelistAddress = getRandomAddress ( ) ;
379- const bulkOrdersWithWhitelist = [
346+ const bulkAccessesWithWhitelist = [
380347 {
381- ...mockBulkOrders [ 0 ] ,
348+ ...mockBulkAccesses [ 0 ] ,
382349 requesterrestrict : validWhitelistAddress ,
383350 } ,
384351 ] ;
@@ -417,9 +384,8 @@ describe('prepareBulkRequest', () => {
417384 prepareBulkRequest ( {
418385 // @ts -expect-error Minimal iexec implementation with only what's necessary for this test
419386 iexec,
420- bulkOrders : bulkOrdersWithWhitelist ,
387+ bulkAccesses : bulkAccessesWithWhitelist ,
421388 app : getRandomAddress ( ) ,
422- maxProtectedDataPerTask : 1 ,
423389 } )
424390 // --- THEN
425391 ) . rejects . toThrow (
0 commit comments