Skip to content

Commit 49ff4c9

Browse files
committed
refactor: clean up spacing and improve readability in getGrantedAccess tests
1 parent c2d7b67 commit 49ff4c9

File tree

1 file changed

+90
-50
lines changed

1 file changed

+90
-50
lines changed

packages/sdk/tests/e2e/dataProtectorCore/getGrantedAccess.test.ts

Lines changed: 90 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -258,15 +258,15 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
258258
ethProvider,
259259
teeFramework: 'scone',
260260
});
261-
261+
262262
iexec = new IExec({ ethProvider }, options.iexecOptions);
263-
263+
264264
// Create and publish app order
265265
await iexec.order
266-
.createApporder({
267-
app: sconeAppAddress,
268-
volume: 1000,
269-
tag: ['tee', 'scone']
266+
.createApporder({
267+
app: sconeAppAddress,
268+
volume: 1000,
269+
tag: ['tee', 'scone'],
270270
})
271271
.then(iexec.order.signApporder)
272272
.then(iexec.order.publishApporder);
@@ -317,22 +317,30 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
317317
const mockTaskObservable = {
318318
subscribe: ({ complete }) => {
319319
if (complete) {
320-
setTimeout(complete, 100); // Simulate some processing time
320+
setTimeout(() => {
321+
complete();
322+
}, 100); // Simulate some processing time
321323
}
322324
return () => {};
323325
},
324326
};
325327

326-
jest.spyOn(iexec.task, 'obsTask').mockResolvedValue(mockTaskObservable as any);
327-
jest.spyOn(iexec.deal, 'computeTaskId').mockResolvedValue('0x123...taskid');
328+
jest
329+
.spyOn(iexec.task, 'obsTask')
330+
.mockResolvedValue(mockTaskObservable as any);
331+
jest
332+
.spyOn(iexec.deal, 'computeTaskId')
333+
.mockResolvedValue('0x123...taskid');
328334

329335
// Mock the order matching to simulate successful order consumption
330336
const mockMatchResult = {
331337
dealid: '0x123...dealid',
332338
txHash: '0x123...txhash',
333339
volume: new BN(1),
334340
};
335-
jest.spyOn(iexec.order, 'matchOrders').mockResolvedValue(mockMatchResult);
341+
jest
342+
.spyOn(iexec.order, 'matchOrders')
343+
.mockResolvedValue(mockMatchResult);
336344

337345
// Send 1 email (process the protected data)
338346
try {
@@ -348,15 +356,19 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
348356
});
349357
} catch (error) {
350358
// We expect this to fail due to mocking, but the order should still be consumed
351-
console.log('Expected processing error due to mocking:', error.message);
359+
console.log(
360+
'Expected processing error due to mocking:',
361+
error.message
362+
);
352363
}
353364

354365
// Check that remaining access shows 4 (not 5)
355-
const { grantedAccess: accessAfter } = await dataProtectorCore.getGrantedAccess({
356-
protectedData: protectedData.address,
357-
authorizedApp: sconeAppAddress,
358-
authorizedUser: userAddress,
359-
});
366+
const { grantedAccess: accessAfter } =
367+
await dataProtectorCore.getGrantedAccess({
368+
protectedData: protectedData.address,
369+
authorizedApp: sconeAppAddress,
370+
authorizedUser: userAddress,
371+
});
360372

361373
expect(accessAfter).toHaveLength(1);
362374
expect(accessAfter[0].remainingAccess).toBe(4);
@@ -392,14 +404,22 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
392404
const mockTaskObservable = {
393405
subscribe: ({ complete }) => {
394406
if (complete) {
395-
setTimeout(complete, 100);
407+
if (complete) {
408+
setTimeout(() => {
409+
complete();
410+
}, 100); // Simulate some processing time
411+
}
396412
}
397413
return () => {};
398414
},
399415
};
400416

401-
jest.spyOn(iexec.task, 'obsTask').mockResolvedValue(mockTaskObservable as any);
402-
jest.spyOn(iexec.deal, 'computeTaskId').mockResolvedValue('0x124...taskid');
417+
jest
418+
.spyOn(iexec.task, 'obsTask')
419+
.mockResolvedValue(mockTaskObservable as any);
420+
jest
421+
.spyOn(iexec.deal, 'computeTaskId')
422+
.mockResolvedValue('0x124...taskid');
403423
jest.spyOn(iexec.order, 'matchOrders').mockResolvedValue({
404424
dealid: '0x124...dealid',
405425
txHash: '0x124...txhash',
@@ -418,15 +438,19 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
418438
args: 'test_args_2',
419439
});
420440
} catch (error) {
421-
console.log('Expected processing error due to mocking:', error.message);
441+
console.log(
442+
'Expected processing error due to mocking:',
443+
error.message
444+
);
422445
}
423446

424447
// Check that remaining access shows 4
425-
const { grantedAccess: accessAfterFirstEmail } = await dataProtectorCore.getGrantedAccess({
426-
protectedData: protectedData.address,
427-
authorizedApp: sconeAppAddress,
428-
authorizedUser: userAddress,
429-
});
448+
const { grantedAccess: accessAfterFirstEmail } =
449+
await dataProtectorCore.getGrantedAccess({
450+
protectedData: protectedData.address,
451+
authorizedApp: sconeAppAddress,
452+
authorizedUser: userAddress,
453+
});
430454

431455
expect(accessAfterFirstEmail).toHaveLength(1);
432456
expect(accessAfterFirstEmail[0].remainingAccess).toBe(4);
@@ -440,11 +464,12 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
440464
});
441465

442466
// Check that remaining access shows 9 (4 + 5)
443-
const { grantedAccess: accessAfterReGrant } = await dataProtectorCore.getGrantedAccess({
444-
protectedData: protectedData.address,
445-
authorizedApp: sconeAppAddress,
446-
authorizedUser: userAddress,
447-
});
467+
const { grantedAccess: accessAfterReGrant } =
468+
await dataProtectorCore.getGrantedAccess({
469+
protectedData: protectedData.address,
470+
authorizedApp: sconeAppAddress,
471+
authorizedUser: userAddress,
472+
});
448473

449474
expect(accessAfterReGrant).toHaveLength(1);
450475
expect(accessAfterReGrant[0].remainingAccess).toBe(9);
@@ -476,11 +501,12 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
476501
});
477502

478503
// Check initial state: should show 2 remaining
479-
const { grantedAccess: initialAccess } = await dataProtectorCore.getGrantedAccess({
480-
protectedData: protectedData.address,
481-
authorizedApp: sconeAppAddress,
482-
authorizedUser: userAddress,
483-
});
504+
const { grantedAccess: initialAccess } =
505+
await dataProtectorCore.getGrantedAccess({
506+
protectedData: protectedData.address,
507+
authorizedApp: sconeAppAddress,
508+
authorizedUser: userAddress,
509+
});
484510

485511
expect(initialAccess).toHaveLength(1);
486512
expect(initialAccess[0].remainingAccess).toBe(2);
@@ -489,14 +515,20 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
489515
const mockTaskObservable = {
490516
subscribe: ({ complete }) => {
491517
if (complete) {
492-
setTimeout(complete, 100);
518+
setTimeout(() => {
519+
complete();
520+
}, 100); // Simulate some processing time
493521
}
494522
return () => {};
495523
},
496524
};
497525

498-
jest.spyOn(iexec.task, 'obsTask').mockResolvedValue(mockTaskObservable as any);
499-
jest.spyOn(iexec.deal, 'computeTaskId').mockResolvedValue('0x125...taskid');
526+
jest
527+
.spyOn(iexec.task, 'obsTask')
528+
.mockResolvedValue(mockTaskObservable as any);
529+
jest
530+
.spyOn(iexec.deal, 'computeTaskId')
531+
.mockResolvedValue('0x125...taskid');
500532

501533
// Send first email
502534
jest.spyOn(iexec.order, 'matchOrders').mockResolvedValue({
@@ -517,15 +549,19 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
517549
args: 'test_args_3_1',
518550
});
519551
} catch (error) {
520-
console.log('Expected processing error due to mocking:', error.message);
552+
console.log(
553+
'Expected processing error due to mocking:',
554+
error.message
555+
);
521556
}
522557

523558
// After email 1: should show 1 remaining
524-
const { grantedAccess: accessAfterFirst } = await dataProtectorCore.getGrantedAccess({
525-
protectedData: protectedData.address,
526-
authorizedApp: sconeAppAddress,
527-
authorizedUser: userAddress,
528-
});
559+
const { grantedAccess: accessAfterFirst } =
560+
await dataProtectorCore.getGrantedAccess({
561+
protectedData: protectedData.address,
562+
authorizedApp: sconeAppAddress,
563+
authorizedUser: userAddress,
564+
});
529565

530566
expect(accessAfterFirst).toHaveLength(1);
531567
expect(accessAfterFirst[0].remainingAccess).toBe(1);
@@ -549,15 +585,19 @@ describe('dataProtectorCore.getGrantedAccess()', () => {
549585
args: 'test_args_3_2',
550586
});
551587
} catch (error) {
552-
console.log('Expected processing error due to mocking:', error.message);
588+
console.log(
589+
'Expected processing error due to mocking:',
590+
error.message
591+
);
553592
}
554593

555594
// After email 2: should show 0 remaining
556-
const { grantedAccess: accessAfterSecond } = await dataProtectorCore.getGrantedAccess({
557-
protectedData: protectedData.address,
558-
authorizedApp: sconeAppAddress,
559-
authorizedUser: userAddress,
560-
});
595+
const { grantedAccess: accessAfterSecond } =
596+
await dataProtectorCore.getGrantedAccess({
597+
protectedData: protectedData.address,
598+
authorizedApp: sconeAppAddress,
599+
authorizedUser: userAddress,
600+
});
561601

562602
expect(accessAfterSecond).toHaveLength(1);
563603
expect(accessAfterSecond[0].remainingAccess).toBe(0);

0 commit comments

Comments
 (0)