@@ -397,13 +397,13 @@ describe('Given the Aave Vaults', () => {
397397 } ) ;
398398 assertOk ( vaultInfoBefore ) ;
399399 annotate (
400- `totalFeeRevenue: ${ Number (
401- vaultInfoBefore . value ?. totalFeeRevenue . amount . value ,
402- ) } `,
400+ `totalFeeRevenue: ${
401+ vaultInfoBefore . value ?. totalFeeRevenue . amount . value
402+ } `,
403403 ) ;
404404 expect (
405- Number ( vaultInfoBefore . value ?. totalFeeRevenue . amount . value ) ,
406- ) . toBeGreaterThan ( 0 ) ;
405+ vaultInfoBefore . value ?. totalFeeRevenue . amount . value ,
406+ ) . toBeBigDecimalGreaterThan ( '0' ) ;
407407 const balanceBefore = await getBalance (
408408 evmAddress ( organization . account ! . address ) ,
409409 initialVault . value ?. usedReserve . aToken . address ,
@@ -425,9 +425,7 @@ describe('Given the Aave Vaults', () => {
425425 initialVault . value ?. usedReserve . aToken . address ,
426426 ) ;
427427 annotate ( `balance after: ${ balanceAfter } ` ) ;
428- expect ( balanceAfter * 10 ** 18 ) . toBeGreaterThan (
429- balanceBefore * 10 ** 18 ,
430- ) ;
428+ expect ( balanceAfter ) . toBeGreaterThan ( balanceBefore ) ;
431429 } , 60_000 ) ;
432430 } ) ;
433431
@@ -609,13 +607,9 @@ describe('Given the Aave Vaults', () => {
609607
610608 assertOk ( listOfVaultsDesc ) ;
611609 expect (
612- Number (
613- listOfVaultsDesc . value . items [ 0 ] ! . userShares ! . shares . amount . value ,
614- ) ,
615- ) . toBeGreaterThanOrEqual (
616- Number (
617- listOfVaultsDesc . value . items [ 1 ] ! . userShares ! . shares . amount . value ,
618- ) ,
610+ listOfVaultsDesc . value . items [ 0 ] ! . userShares ! . shares . amount . raw ,
611+ ) . toBeBigDecimalGreaterThan (
612+ listOfVaultsDesc . value . items [ 1 ] ! . userShares ! . shares . amount . raw ,
619613 ) ;
620614
621615 const listOfVaultsAsc = await userVaults ( client , {
@@ -625,9 +619,9 @@ describe('Given the Aave Vaults', () => {
625619
626620 assertOk ( listOfVaultsAsc ) ;
627621 expect (
628- Number ( listOfVaultsAsc . value . items [ 0 ] ! . userShares ! . shares . amount . value ) ,
629- ) . toBeLessThanOrEqual (
630- Number ( listOfVaultsAsc . value . items [ 1 ] ! . userShares ! . shares . amount . value ) ,
622+ listOfVaultsAsc . value . items [ 1 ] ! . userShares ! . shares . amount . raw ,
623+ ) . toBeBigDecimalGreaterThan (
624+ listOfVaultsAsc . value . items [ 0 ] ! . userShares ! . shares . amount . raw ,
631625 ) ;
632626 } ) ;
633627
@@ -642,10 +636,8 @@ describe('Given the Aave Vaults', () => {
642636
643637 assertOk ( listOfVaultsDesc ) ;
644638 expect (
645- Number ( listOfVaultsDesc . value . items [ 0 ] ?. fee . value ) ,
646- ) . toBeGreaterThanOrEqual (
647- Number ( listOfVaultsDesc . value . items [ 1 ] ?. fee . value ) ,
648- ) ;
639+ listOfVaultsDesc . value . items [ 0 ] ?. fee . value ,
640+ ) . toBeBigDecimalGreaterThan ( listOfVaultsDesc . value . items [ 1 ] ?. fee . value ) ;
649641
650642 const listOfVaultsAsc = await userVaults ( client , {
651643 user : evmAddress ( user . account ! . address ) ,
@@ -654,8 +646,8 @@ describe('Given the Aave Vaults', () => {
654646
655647 assertOk ( listOfVaultsAsc ) ;
656648 expect (
657- Number ( listOfVaultsAsc . value . items [ 0 ] ?. fee . value ) ,
658- ) . toBeLessThanOrEqual ( Number ( listOfVaultsAsc . value . items [ 1 ] ?. fee . value ) ) ;
649+ listOfVaultsAsc . value . items [ 1 ] ?. fee . value ,
650+ ) . toBeBigDecimalGreaterThan ( listOfVaultsAsc . value . items [ 0 ] ?. fee . value ) ;
659651 } ) ;
660652
661653 it ( 'Then it should be possible so filter them by underlying tokens' , async ( {
0 commit comments