e2e: oneLendingPool determinism

Author: DanielSchiavini

.github/workflows/ci.yaml

@@ -140,6 +140,7 @@ jobs:
 
       - name: Check runtime errors
         if: always()
+        # todo: add `Cannot destructure .. as it is undefined`
         run: if grep --ignore-case --extended-regexp "update depth exceeded|many re-renders|unmounted component|non-unique keys|uncontrolled to controlled|properties of undefined" e2e-*.log; then exit 1; fi
 
       - uses: actions/upload-artifact@v4

tests/cypress/support/generators.ts

@@ -1,7 +1,7 @@
 import type { Address } from '@curvefi/prices-api'
 import { range, recordValues } from '@curvefi/prices-api/objects.util'
 
-export const MAX_USD_VALUE = 40_000_000 // $ 40m 🤑 not higher so we can test the highest TVL
+export const MAX_USD_VALUE = 400_000_000
 
 export const oneFloat = (minOrMax = 1, maxExclusive?: number): number =>
   maxExclusive === undefined ? Math.random() * minOrMax : minOrMax + Math.random() * (maxExclusive - minOrMax)

tests/cypress/support/helpers/lending-mocks.ts

@@ -7,27 +7,31 @@ import { SMALL_POOL_TVL } from '@ui-kit/features/user-profile/store'
 const LendingChains = ['ethereum', 'fraxtal', 'arbitrum'] as const
 export type Chain = (typeof LendingChains)[number]
 
+// keep the general pool TVL below the special HighTVL row to guarantee ordering in tests
 const oneLargeTvl = () => oneFloat(SMALL_POOL_TVL, MAX_USD_VALUE)
 const oneSmallTvl = () => oneFloat(SMALL_POOL_TVL)
 
 const oneLendingPool = (
   chain: Chain,
-  { utilization, tvl = oneLargeTvl() }: { utilization: number; tvl?: number },
+  { utilization = oneFloat(0.99), tvl = oneLargeTvl() }: { utilization?: number; tvl?: number },
 ): GetMarketsResponse['data'][number] => {
   const collateral = oneToken(chain)
   const borrowed = oneToken(chain)
-  const collateralBalance = oneFloat()
   const borrowedPrice = borrowed.usdPrice ?? onePrice()
   const collateralPrice = collateral.usdPrice ?? onePrice()
-  const totalAssets = onePrice(MAX_USD_VALUE / collateralPrice)
-  const totalAssetsUsd = totalAssets * collateralPrice
-  const totalDebtUsd = utilization * totalAssetsUsd
+  const liquidityUsd = Math.max(0, oneFloat(0, tvl)) // portion of TVL represented by (assets - debt)
+  const totalAssetsUsd = liquidityUsd / (1 - utilization)
+  const totalDebtUsd = totalAssetsUsd * utilization
+  const totalAssets = totalAssetsUsd / collateralPrice
+  const totalDebt = totalDebtUsd / borrowedPrice
   const minBand = oneInt()
   const minted = onePrice()
   const redeemed = onePrice(minted)
-  const collateralBalanceUsd = collateralBalance * collateralPrice
-  const borrowedBalanceUsd = tvl + totalDebtUsd - collateralBalanceUsd - totalAssetsUsd
-  const borrowedBalance = borrowedBalanceUsd * borrowedPrice
+  const remainderUsd = Math.max(tvl - liquidityUsd, 0) // portion of TVL not covered by liquidity
+  const collateralBalanceUsd = remainderUsd === 0 ? 0 : oneFloat(0, remainderUsd)
+  const borrowedBalanceUsd = remainderUsd - collateralBalanceUsd
+  const collateralBalance = collateralBalanceUsd / collateralPrice
+  const borrowedBalance = borrowedBalanceUsd / borrowedPrice
   return {
     name: [collateral.symbol, borrowed.symbol].join('-'),
     controller: oneAddress(),
@@ -46,7 +50,7 @@ const oneLendingPool = (
     price_oracle: onePrice(),
     amm_price: onePrice(),
     base_price: onePrice(),
-    total_debt: totalDebtUsd / borrowedPrice,
+    total_debt: totalDebt,
     total_assets: totalAssets,
     total_debt_usd: totalDebtUsd,
     total_assets_usd: totalAssetsUsd,
@@ -89,7 +93,7 @@ function oneLendingVaultResponse(chain: Chain): GetMarketsResponse {
           },
           {
             // largest TVL to test the sorting
-            ...oneLendingPool(chain, { utilization: oneFloat(), tvl: MAX_USD_VALUE }),
+            ...oneLendingPool(chain, { utilization: oneFloat(0.4, 0.8), tvl: MAX_USD_VALUE * 2 }),
             address: HighTVLAddress,
             vault: HighTVLAddress,
             controller: HighTVLAddress,
@@ -102,12 +106,8 @@ function oneLendingVaultResponse(chain: Chain): GetMarketsResponse {
             controller: HighUtilizationAddress,
           },
           {
-            // 0 TVL (below 10k) to test the slider filter
-            ...oneLendingPool(chain, { utilization: oneFloat() }),
-            total_assets_usd: 0,
-            total_debt_usd: 0,
-            collateral_balance_usd: 0,
-            borrowed_balance_usd: 0,
+            // small TVL to test the slider filter
+            ...oneLendingPool(chain, { tvl: SMALL_POOL_TVL / 2 }),
           },
         ] as GetMarketsResponse['data'])
       : []),