diff --git a/tests/withWallet/aaveV3/base/aaveV3BorrowBase.spec.ts b/tests/withWallet/aaveV3/base/aaveV3BorrowBase.spec.ts index 7c9225ba..fb2e9ba5 100644 --- a/tests/withWallet/aaveV3/base/aaveV3BorrowBase.spec.ts +++ b/tests/withWallet/aaveV3/base/aaveV3BorrowBase.spec.ts @@ -32,11 +32,6 @@ test.describe('Aave V3 Borrow - Base - Wallet connected', async () => { test('It should open and magage an Aave V3 Borrow Base position @regression', async ({ metamask, }) => { - test.info().annotations.push({ - type: 'Test case', - description: '12473', - }); - test.setTimeout(extremelyLongTestTimeout); await app.page.goto('/base/aave/v3/borrow/eth-usdbc#simulate'); @@ -53,7 +48,7 @@ test.describe('Aave V3 Borrow - Base - Wallet connected', async () => { }); }); - // Skip again if DB collision also happeningwith omni + // Skip again if DB collision also happening with omni await test.step('It should Deposit and Borrow in a single tx', async () => { await app.page.waitForTimeout(1_000); diff --git a/tests/withWallet/z_openPositions/aaveV3/ethereum/aavev3Borrow.spec.ts b/tests/withWallet/z_openPositions/aaveV3/ethereum/aavev3Borrow.spec.ts index 87dd680b..bad80087 100644 --- a/tests/withWallet/z_openPositions/aaveV3/ethereum/aavev3Borrow.spec.ts +++ b/tests/withWallet/z_openPositions/aaveV3/ethereum/aavev3Borrow.spec.ts @@ -1,16 +1,17 @@ import { - aaveV3EthereumBorrowPools_1, - aaveV3EthereumBorrowPools_2, - aaveV3EthereumBorrowPools_3, - aaveV3EthereumBorrowPools_4, - aaveV3EthereumBorrowPools_5, - aaveV3EthereumBorrowPools_6, + aaveV3EthereumBorrowPools, + // aaveV3EthereumBorrowPools_1, + // aaveV3EthereumBorrowPools_2, + // aaveV3EthereumBorrowPools_3, + // aaveV3EthereumBorrowPools_4, + // aaveV3EthereumBorrowPools_5, + // aaveV3EthereumBorrowPools_6, // aaveV3EthereumBorrowPools_7, // aaveV3EthereumBorrowPools_8, } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -aaveV3EthereumBorrowPools_1.forEach(async (pool) => { +aaveV3EthereumBorrowPools.forEach(async (pool) => { await openNewPosition({ network: 'ethereum', protocol: 'aave/v3', @@ -19,50 +20,61 @@ aaveV3EthereumBorrowPools_1.forEach(async (pool) => { }); }); -aaveV3EthereumBorrowPools_2.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'aave/v3', - pool, - positionType: 'borrow', - }); -}); +// aaveV3EthereumBorrowPools_1.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'aave/v3', +// pool, +// positionType: 'borrow', +// }); +// }); -aaveV3EthereumBorrowPools_3.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'aave/v3', - pool, - positionType: 'borrow', - }); -}); +// aaveV3EthereumBorrowPools_2.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'aave/v3', +// pool, +// positionType: 'borrow', +// }); +// }); -aaveV3EthereumBorrowPools_4.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'aave/v3', - pool, - positionType: 'borrow', - }); -}); +// aaveV3EthereumBorrowPools_3.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'aave/v3', +// pool, +// positionType: 'borrow', +// }); +// }); -aaveV3EthereumBorrowPools_5.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'aave/v3', - pool, - positionType: 'borrow', - }); -}); +// aaveV3EthereumBorrowPools_4.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'aave/v3', +// pool, +// positionType: 'borrow', +// }); +// }); -aaveV3EthereumBorrowPools_6.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'aave/v3', - pool, - positionType: 'borrow', - }); -}); +// aaveV3EthereumBorrowPools_5.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'aave/v3', +// pool, +// positionType: 'borrow', +// }); +// }); + +// aaveV3EthereumBorrowPools_6.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'aave/v3', +// pool, +// positionType: 'borrow', +// }); +// }); + +// ======================= // aaveV3EthereumBorrowPools_7.forEach(async (pool) => { // await openNewPosition({ diff --git a/tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow_1.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow.spec.ts similarity index 63% rename from tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow_1.spec.ts rename to tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow.spec.ts index 56aafbb8..d81737f6 100644 --- a/tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow_1.spec.ts +++ b/tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow.spec.ts @@ -1,7 +1,7 @@ -import { morphoBaseBorrowPools1 } from 'utils/testData'; +import { morphoBaseBorrowPools } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -morphoBaseBorrowPools1.forEach(async (pool) => { +morphoBaseBorrowPools.forEach(async (pool) => { await openNewPosition({ network: 'base', protocol: 'morphoblue', diff --git a/tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow_2.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow_2.spec.ts deleted file mode 100644 index 66501cee..00000000 --- a/tests/withWallet/z_openPositions/morphoBlue/base/morphoBorrow_2.spec.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { morphoBaseBorrowPools2 } from 'utils/testData'; -import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; - -morphoBaseBorrowPools2.forEach(async (pool) => { - await openNewPosition({ - network: 'base', - protocol: 'morphoblue', - pool, - positionType: 'borrow', - }); -}); diff --git a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow.spec.ts b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow.spec.ts index 33d415a0..87dc6876 100644 --- a/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow.spec.ts +++ b/tests/withWallet/z_openPositions/morphoBlue/ethereum/morphoBorrow.spec.ts @@ -1,12 +1,13 @@ import { - morphoEthereumBorrowPools_1, - morphoEthereumBorrowPools_2, - morphoEthereumBorrowPools_3, - morphoEthereumBorrowPools_4, + morphoEthereumBorrowPools, + // morphoEthereumBorrowPools_1, + // morphoEthereumBorrowPools_2, + // morphoEthereumBorrowPools_3, + // morphoEthereumBorrowPools_4, } from 'utils/testData'; import { openNewPosition } from 'tests/sharedTestSteps/openNewPosition'; -morphoEthereumBorrowPools_1.forEach(async (pool) => { +morphoEthereumBorrowPools.forEach(async (pool) => { await openNewPosition({ network: 'ethereum', protocol: 'morphoblue', @@ -15,29 +16,38 @@ morphoEthereumBorrowPools_1.forEach(async (pool) => { }); }); -morphoEthereumBorrowPools_2.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'morphoblue', - pool, - positionType: 'borrow', - }); -}); +// morphoEthereumBorrowPools_1.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'morphoblue', +// pool, +// positionType: 'borrow', +// }); +// }); -morphoEthereumBorrowPools_3.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'morphoblue', - pool, - positionType: 'borrow', - }); -}); +// morphoEthereumBorrowPools_2.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'morphoblue', +// pool, +// positionType: 'borrow', +// }); +// }); -morphoEthereumBorrowPools_4.forEach(async (pool) => { - await openNewPosition({ - network: 'ethereum', - protocol: 'morphoblue', - pool, - positionType: 'borrow', - }); -}); +// morphoEthereumBorrowPools_3.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'morphoblue', +// pool, +// positionType: 'borrow', +// }); +// }); + +// morphoEthereumBorrowPools_4.forEach(async (pool) => { +// await openNewPosition({ +// network: 'ethereum', +// protocol: 'morphoblue', +// pool, +// positionType: 'borrow', +// }); +// }); diff --git a/utils/testData.ts b/utils/testData.ts index 1c33760f..610047d8 100644 --- a/utils/testData.ts +++ b/utils/testData.ts @@ -57,9 +57,23 @@ export const morphoEthereumEarnPools_3 = [ ]; // 'WOETH-ETH', --> NO LIQUIDITY -export const morphoEthereumEarnPools_4 = ['EZETH-ETH', 'SUSDE-DAI-1', 'SUSDE-DAI-2', 'SUSDE-DAI-3']; +export const morphoEthereumEarnPools_4 = ['EZETH-ETH', 'SUSDE-DAI-1', 'SUSDE-DAI-3']; +// 'USDE-DAI-2', --> NO LIQUIDITY -export const morphoEthereumBorrowPools_1 = ['USDE-DAI-2', 'OSETH-ETH', 'EZETH-ETH']; +export const morphoEthereumBorrowPools = [ + 'OSETH-ETH', + 'EZETH-ETH', + 'SUSDE-DAI-3', + 'SUSDE-DAI-4', + 'SUSDE-USDT', + 'WSTETH-ETH-2', + 'WSTETH-USDA', + 'SWBTC-WBTC', + 'RSWETH-ETH', +]; +// 'USDE-DAI-2', --> NO LIQUIDITY +// 'RSETH-ETH', --> NO LIQUIDITY +// 'WOETH-ETH', --> NO LIQUIDITY // 'USDE-DAI-1', --> Already tested in /withWallet/morphoBlue // 'USDE-DAI-3', --> Already tested in /withWallet/morphoBlue // 'SUSDE-DAI-1', --> Already tested in /withWallet/morphoBlue @@ -73,13 +87,13 @@ export const morphoEthereumBorrowPools_1 = ['USDE-DAI-2', 'OSETH-ETH', 'EZETH-ET // 'MKR-USDC', --> Already tested in /withWallet/morphoBlue // 'WEETH-ETH', --> Already tested in /withWallet/morphoBlue -export const morphoEthereumBorrowPools_2 = ['SUSDE-DAI-4']; // ['SUSDE-DAI-3', 'SUSDE-DAI-4', 'SUSDE-USDT']; +// export const morphoEthereumBorrowPools_1 = ['USDE-DAI-2', 'OSETH-ETH', 'EZETH-ETH']; -export const morphoEthereumBorrowPools_3 = ['WSTETH-ETH-2', 'WSTETH-USDA', 'SWBTC-WBTC']; +// export const morphoEthereumBorrowPools_2 = ['SUSDE-DAI-3', 'SUSDE-DAI-4', 'SUSDE-USDT']; -export const morphoEthereumBorrowPools_4 = ['RSWETH-ETH']; -// 'RSETH-ETH', --> NO LIQUIDITY -// 'WOETH-ETH', --> NO LIQUIDITY +// export const morphoEthereumBorrowPools_3 = ['WSTETH-ETH-2', 'WSTETH-USDA', 'SWBTC-WBTC']; + +// export const morphoEthereumBorrowPools_4 = ['RSWETH-ETH']; export const morphoBaseMultiplyPools = ['ETH-USDC', 'WSTETH-USDC']; // , 'WEETH-USDC' --> WEETH supply 100% @@ -95,18 +109,23 @@ export const morphoBaseEarnPools = [ // 'BSDETH-ETH', -- NO 'SWAP' LIQUIDITY ]; -export const morphoBaseBorrowPools1 = [ +export const morphoBaseBorrowPools = [ 'CBETH-ETH', 'WSTETH-ETH-2', 'WSTETH-USDC', 'WEETH-ETH', - 'WEETH-USDC', + 'EZETH-USDC', + 'WSUPEROETHB-ETH', + 'CBETH-USDC', ]; +// 'WEETH-USDC', -- NO LIQUIDITY // 'BSDETH-ETH', -- NO LIQUIDITY +// 'AERO-USDC', -- NO LIQUIDITY // 'ETH-USDC', --> Already tested in /withWallet/morphoBlue -export const morphoBaseBorrowPools2 = ['EZETH-USDC', 'WSUPEROETHB-ETH', 'CBETH-USDC']; -// 'AERO-USDC', -- NO LIQUIDITY +// export const morphoBaseBorrowPools1 = ['CBETH-ETH', 'WSTETH-ETH-2', 'WSTETH-USDC', 'WEETH-ETH']; + +// export const morphoBaseBorrowPools2 = ['EZETH-USDC', 'WSUPEROETHB-ETH', 'CBETH-USDC']; export const aaveV3EthereumEarnPools_1 = ['WSTETH-CBETH', 'RETH-ETH']; @@ -155,36 +174,23 @@ export const aaveV3EthereumMultiplyPools_7 = ['DAI-ETH', 'DAI-MKR', 'SDAI-WBTC', export const aaveV3EthereumMultiplyPools_8 = ['USDC-WSTETH', 'USDC-WBTC', 'USDT-ETH']; -export const aaveV3EthereumBorrowPools_1 = ['ETH-USDT', 'ETH-WBTC']; -// 'LDO-USDT' skipped as tenderly_setErc20Balance is not working with LDO -// 'ETH-GHO', -- NO LIQUIDITY - GHO -// 'WBTC-GHO', -- NO LIQUIDITY - GHO -// 'WSTETH-GHO', -- NO LIQUIDITY - GHO -// 'RETH-GHO', -- NO LIQUIDITY - GHO -// 'WEETH-GHO', -- NO LIQUIDITY - GHO -// 'LINK-GHO', -- NO LIQUIDITY - GHO -// 'SDAI-GHO', -- NO LIQUIDITY - GHO -// 'USDC-GHO', -- NO LIQUIDITY - GHO -// 'ETH-DAI', --> Already tested in /withWallet/aaveV3 -// 'ETH-USDC', --> Already tested in /withWallet/aaveV3 -// 'WBTC-DAI', --> Already tested in /withWallet/aaveV3 -// 'WSTETH-USDT', --> Already tested in /withWallet/aaveV3 - -export const aaveV3EthereumBorrowPools_2 = ['WBTC-USDC', 'WBTC-USDT', 'WBTC-LUSD', 'WBTC-ETH']; - -export const aaveV3EthereumBorrowPools_3 = [ +export const aaveV3EthereumBorrowPools = [ + 'ETH-USDT', + 'ETH-WBTC', + 'WBTC-USDC', + 'WBTC-USDT', + 'WBTC-LUSD', + 'WBTC-ETH', 'WSTETH-DAI', 'WSTETH-USDC', 'WSTETH-LUSD', 'WSTETH-RPL', 'WSTETH-CBETH', -]; - -export const aaveV3EthereumBorrowPools_4 = ['RETH-DAI', 'RETH-USDC', 'RETH-USDT']; - -export const aaveV3EthereumBorrowPools_5 = ['CBETH-USDC', 'CBETH-GHO']; - -export const aaveV3EthereumBorrowPools_6 = [ + 'RETH-DAI', + 'RETH-USDC', + 'RETH-USDT', + 'CBETH-USDC', + 'CBETH-GHO', 'LINK-DAI', 'LINK-USDC', 'LINK-USDT', @@ -202,6 +208,35 @@ export const aaveV3EthereumBorrowPools_6 = [ 'USDT-ETH', ]; +// export const aaveV3EthereumBorrowPools_1 = ['ETH-USDT', 'ETH-WBTC']; +// 'LDO-USDT' skipped as tenderly_setErc20Balance is not working with LDO +// 'ETH-GHO', -- NO LIQUIDITY - GHO +// 'WBTC-GHO', -- NO LIQUIDITY - GHO +// 'WSTETH-GHO', -- NO LIQUIDITY - GHO +// 'RETH-GHO', -- NO LIQUIDITY - GHO +// 'WEETH-GHO', -- NO LIQUIDITY - GHO +// 'LINK-GHO', -- NO LIQUIDITY - GHO +// 'SDAI-GHO', -- NO LIQUIDITY - GHO +// 'USDC-GHO', -- NO LIQUIDITY - GHO +// 'ETH-DAI', --> Already tested in /withWallet/aaveV3 +// 'ETH-USDC', --> Already tested in /withWallet/aaveV3 +// 'WBTC-DAI', --> Already tested in /withWallet/aaveV3 +// 'WSTETH-USDT', --> Already tested in /withWallet/aaveV3 + +// export const aaveV3EthereumBorrowPools_2 = ['WBTC-USDC', 'WBTC-USDT', 'WBTC-LUSD', 'WBTC-ETH']; + +// export const aaveV3EthereumBorrowPools_3 = [ +// 'WSTETH-DAI', +// 'WSTETH-USDC', +// 'WSTETH-LUSD', +// 'WSTETH-RPL', +// 'WSTETH-CBETH', +// ]; + +// export const aaveV3EthereumBorrowPools_4 = ['RETH-DAI', 'RETH-USDC', 'RETH-USDT']; + +// export const aaveV3EthereumBorrowPools_5 = ['CBETH-USDC', 'CBETH-GHO']; + // export const aaveV3EthereumBorrowPools_6 = [ // 'LINK-DAI', // 'LINK-USDC',