Merge pull request #551 from OasisDEX/daily-improvements-01-oct

Daily improvements 01 oct
OasisDEX · Oct 1, 2024 · 5c08cfc · 5c08cfc
2 parents 6407332 + 534ee7a
commit 5c08cfc
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 381 deletions.
diff --git a/.github/workflows/ci_e2e_tests.yml b/.github/workflows/ci_e2e_tests.yml
@@ -16,7 +16,7 @@ jobs:
   staging-deployed-trigger-received:
     runs-on: ubuntu-latest 
     steps:
-      - run: echo "Regression E2E and API tests for ${{ github.event.workflow_dispatch.repository.name }} - RUN_ID ${{ inputs.run_id }}"
+      - run: echo "Regression E2E and API tests for ${{ inputs.repository }} - RUN_ID ${{ inputs.run_id }}"
       - name: Create artifact with trigger repository name
         run: echo "${{ inputs.repository }}" > trigger_repository.txt
       - name: Upload artifact with trigger repository name

diff --git a/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum2.spec.ts b/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum2.spec.ts
@@ -66,6 +66,9 @@ test.describe('Aave v3 Multiply - Arbitrum - Wallet connected', async () => {
 
 		test.setTimeout(longTestTimeout);
 
+		// To avoid flakiness
+		await app.page.waitForTimeout(2_000);
+
 		await close({
 			forkId,
 			app,

diff --git a/tests/withWallet/ajna/base/ajnaMultiplyBase2.spec.ts b/tests/withWallet/ajna/base/ajnaMultiplyBase2.spec.ts
@@ -80,13 +80,16 @@ test.describe('Ajna Base Multiply - Wallet connected', async () => {
 
 		await app.position.openPage('/base/ajna/multiply/ETH-USDC/435#overview');
 
+		// Delay to avoid random fails
+		await app.page.waitForTimeout(2_000);
+
 		await close({
 			forkId,
 			app,
 			closeTo: 'collateral',
 			collateralToken: 'ETH',
 			debtToken: 'USDC',
-			tokenAmountAfterClosing: '0.00[0-9]{2}',
+			tokenAmountAfterClosing: '0.00([0-9]{2})?',
 		});
 	});
 });
diff --git a/tests/withWallet/ajna/base/ajnaMultiplyBase3.spec.ts b/tests/withWallet/ajna/base/ajnaMultiplyBase3.spec.ts
@@ -10,7 +10,8 @@ let app: App;
 
 test.describe.configure({ mode: 'serial' });
 
-test.describe('Ajna Base Multiply - Wallet connected', async () => {
+// NO LIQUIDITY
+test.describe.skip('Ajna Base Multiply - Wallet connected', async () => {
 	test.afterAll(async () => {
 		await app.page.close();
 

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny1.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny1.spec.ts
@@ -57,8 +57,8 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 		await openMakerPosition({
 			app,
 			forkId,
-			deposit: { token: 'ETH', amount: '10' },
-			generate: { token: 'DAI', amount: '5000' },
+			deposit: { token: 'ETH', amount: '3.5' },
+			generate: { token: 'DAI', amount: '3500' },
 		});
 
 		await app.page.waitForTimeout(3000);
@@ -77,8 +77,8 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 	(
 		[
 			{ colToken: 'CBETH', debtToken: 'USDC' },
-			{ colToken: 'DAI', debtToken: 'ETH' },
 			{ colToken: 'DAI', debtToken: 'MKR' },
+			{ colToken: 'LINK', debtToken: 'DAI' },
 		] as const
 	).forEach((targetPool) =>
 		test(`It should swap a Maker Borrow position (ETH/DAI) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny2.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny2.spec.ts
@@ -57,8 +57,8 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 		await openMakerPosition({
 			app,
 			forkId,
-			deposit: { token: 'ETH', amount: '10' },
-			generate: { token: 'DAI', amount: '5000' },
+			deposit: { token: 'ETH', amount: '3.5' },
+			generate: { token: 'DAI', amount: '3500' },
 		});
 
 		await app.page.waitForTimeout(3000);
@@ -76,8 +76,11 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 
 	(
 		[
-			{ colToken: 'LINK', debtToken: 'DAI' },
-			{ colToken: 'LINK', debtToken: 'ETH' },
+			{ colToken: 'RETH', debtToken: 'USDC' },
+			{ colToken: 'ETH', debtToken: 'USDC' },
+			{ colToken: 'ETH', debtToken: 'WBTC' },
+			// { colToken: 'LDO', debtToken: 'USDT' }, // BUG - 15943 - NOT working
+			// { colToken: 'MKR', debtToken: 'DAI' }, -- Aave MKR very close to supply cap
 		] as const
 	).forEach((targetPool) =>
 		test(`It should swap a Maker Borrow position (ETH/DAI) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny3.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny3.spec.ts
@@ -57,8 +57,8 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 		await openMakerPosition({
 			app,
 			forkId,
-			deposit: { token: 'ETH', amount: '10' },
-			generate: { token: 'DAI', amount: '5000' },
+			deposit: { token: 'ETH', amount: '3.5' },
+			generate: { token: 'DAI', amount: '3500' },
 		});
 
 		await app.page.waitForTimeout(3000);
@@ -77,9 +77,8 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 	(
 		[
 			{ colToken: 'SDAI', debtToken: 'ETH' },
-			// { colToken: 'SDAI', debtToken: 'GHO' }, - NO LIQUIDITY - GHO
-			{ colToken: 'SDAI', debtToken: 'WBTC' },
-			{ colToken: 'USDC', debtToken: 'ETH' },
+			{ colToken: 'USDC', debtToken: 'USDT' },
+			{ colToken: 'USDC', debtToken: 'WSTETH' }, // BUG - 16003
 		] as const
 	).forEach((targetPool) =>
 		test(`It should swap a Maker Borrow position (ETH/DAI) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny4.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny4.spec.ts
@@ -57,8 +57,8 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 		await openMakerPosition({
 			app,
 			forkId,
-			deposit: { token: 'ETH', amount: '10' },
-			generate: { token: 'DAI', amount: '5000' },
+			deposit: { token: 'ETH', amount: '3.5' },
+			generate: { token: 'DAI', amount: '3500' },
 		});
 
 		await app.page.waitForTimeout(3000);
@@ -76,8 +76,6 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 
 	(
 		[
-			{ colToken: 'WBTC', debtToken: 'DAI' },
-			{ colToken: 'WBTC', debtToken: 'LUSD' },
 			{ colToken: 'WBTC', debtToken: 'USDC' },
 			{ colToken: 'WBTC', debtToken: 'USDT' },
 			{ colToken: 'WBTC', debtToken: 'ETH' },

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny5.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny5.spec.ts
@@ -49,16 +49,16 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 			}));
 		});
 
-		await app.page.goto('vaults/open/ETH-C');
+		await app.page.goto('/vaults/open/ETH-C');
 
 		// Depositing collateral too quickly after loading page returns wrong simulation results
 		await app.position.overview.waitForComponentToBeStable({ positionType: 'Maker' });
 
 		await openMakerPosition({
 			app,
 			forkId,
-			deposit: { token: 'ETH', amount: '10' },
-			generate: { token: 'DAI', amount: '5000' },
+			deposit: { token: 'ETH', amount: '3.5' },
+			generate: { token: 'DAI', amount: '3500' },
 		});
 
 		await app.page.waitForTimeout(3000);
@@ -78,8 +78,6 @@ test.describe('Maker Borrow - Swap to Aave V3', async () => {
 		[
 			{ colToken: 'WSTETH', debtToken: 'CBETH' },
 			{ colToken: 'WSTETH', debtToken: 'DAI' },
-			{ colToken: 'WSTETH', debtToken: 'LUSD' },
-			{ colToken: 'WSTETH', debtToken: 'RPL' },
 			// { colToken: 'WSTETH', debtToken: 'GHO' }, - NO LIQUIDITY - GHO
 		] as const
 	).forEach((targetPool) =>

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny6.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny6.spec.ts
diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny7.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEthDaiToAny7.spec.ts