Merge pull request #216 from OasisDEX/fixes-2

Fixes
OasisDEX · Apr 12, 2024 · b65a40f · b65a40f
2 parents ef55419 + 6ff45a0
commit b65a40f
Show file tree

Hide file tree

Showing 34 changed files with 36 additions and 34 deletions.
diff --git a/tests/sharedTestSteps/positionManagement.ts b/tests/sharedTestSteps/positionManagement.ts
@@ -16,15 +16,15 @@ export const openPosition = async ({
 	borrow,
 	existingDPM,
 	adjustRisk,
-	omni,
+	protocol,
 }: {
 	app: App;
 	forkId: string;
 	deposit: ActionData;
 	borrow?: ActionData;
 	existingDPM?: boolean;
 	adjustRisk?: { positionType?: 'Borrow'; value: number };
-	omni?: { network: 'ethereum' | 'arbitrum' | 'base' | 'optimism' };
+	protocol?: 'Ajna' | 'Morpho Blue';
 }) => {
 	await app.position.setup.deposit(deposit);
 	if (borrow) {
@@ -69,23 +69,22 @@ export const openPosition = async ({
 		await tx.confirmAndVerifySuccess({ metamaskAction: 'confirmPermissionToSpend', forkId });
 	}).toPass({ timeout: longTestTimeout });
 
-	if (omni) {
+	if (protocol) {
+		// UI sometimes gets stuck after confirming position creation
+		//   - 'Reload' added to avoid flakines
+		await app.page.reload();
+		await app.position.setup.goToPosition();
+		await app.position.overview.shouldBeVisible();
+	} else {
 		await app.position.setup.goToPositionShouldBeVisible();
 		const positionId = await app.position.setup.getNewPositionId();
 		//
 		await app.page.waitForTimeout(10_000);
 		//
 		await expect(async () => {
-			// await app.page.goto(positionId.replace(omni.network, `${omni.network}/omni`));
 			await app.page.goto(positionId);
 			await app.position.overview.shouldBeVisible();
 		}).toPass();
-	} else {
-		// UI sometimes gets stuck after confirming position creation
-		//   - 'Reload' added to avoid flakines
-		await app.page.reload();
-		await app.position.setup.goToPosition();
-		await app.position.overview.shouldBeVisible();
 	}
 };
 

diff --git a/tests/withWallet/aaveV2/aaveV2Earn.spec.ts b/tests/withWallet/aaveV2/aaveV2Earn.spec.ts
@@ -45,7 +45,6 @@ test.describe('Aave V2 Earn - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'ETH', amount: '10.09' },
-			omni: { network: 'ethereum' },
 		});
 	});
 });
diff --git a/tests/withWallet/aaveV2/aaveV2Multiply.spec.ts b/tests/withWallet/aaveV2/aaveV2Multiply.spec.ts
@@ -46,7 +46,6 @@ test.describe('Aave v2 Multiply - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'ETH', amount: '2' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/arbitrum/aavV3MultArbAutomations_1.spec.ts b/tests/withWallet/aaveV3/arbitrum/aavV3MultArbAutomations_1.spec.ts
@@ -57,7 +57,6 @@ test.describe('Aave v3 Multiply - Arbitrum - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'WBTC', amount: '0.5' },
 			adjustRisk: { positionType: 'Borrow', value: 0.5 },
-			omni: { network: 'arbitrum' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/arbitrum/aaveV3BorrowArbitrum.spec.ts b/tests/withWallet/aaveV3/arbitrum/aaveV3BorrowArbitrum.spec.ts
@@ -51,7 +51,6 @@ test.describe('Aave V3 Borrow - Arbitrum - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'ETH', amount: '7.5' },
 			borrow: { token: 'USDC', amount: '2000' },
-			omni: { network: 'arbitrum' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum.spec.ts b/tests/withWallet/aaveV3/arbitrum/aaveV3MultiplyArbitrum.spec.ts
@@ -46,7 +46,6 @@ test.describe('Aave v3 Multiply - Arbitrum - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'ETH', amount: '8.12345' },
-			omni: { network: 'arbitrum' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/base/aaveV3BorrowBase_1.spec.ts b/tests/withWallet/aaveV3/base/aaveV3BorrowBase_1.spec.ts
@@ -51,7 +51,6 @@ test.describe('Aave V3 Borrow - Base - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'ETH', amount: '9.12345' },
 			borrow: { token: 'USDBC', amount: '2000' },
-			omni: { network: 'base' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/base/aaveV3EarnBase.spec.ts b/tests/withWallet/aaveV3/base/aaveV3EarnBase.spec.ts
@@ -55,7 +55,6 @@ test.describe('Aave V3 Earn - Base - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'CBETH', amount: '5' },
-			omni: { network: 'base' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/base/aaveV3MultiplyBase.spec.ts b/tests/withWallet/aaveV3/base/aaveV3MultiplyBase.spec.ts
@@ -55,7 +55,6 @@ test.describe('Aave v3 Multiply - Base - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'CBETH', amount: '14' },
-			omni: { network: 'base' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/base/aaveV3MultiplyBaseAutomations_1.spec.ts b/tests/withWallet/aaveV3/base/aaveV3MultiplyBaseAutomations_1.spec.ts
@@ -48,7 +48,6 @@ test.describe('Aave v3 Multiply - Base - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'ETH', amount: '10' },
 			adjustRisk: { positionType: 'Borrow', value: 0.4 },
-			omni: { network: 'base' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/base/aaveV3MultiplyBaseAutomations_2.spec.ts b/tests/withWallet/aaveV3/base/aaveV3MultiplyBaseAutomations_2.spec.ts
@@ -48,7 +48,6 @@ test.describe('Aave v3 Multiply - Base - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'ETH', amount: '10' },
 			adjustRisk: { positionType: 'Borrow', value: 0.4 },
-			omni: { network: 'base' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/ethereum/Multiply/aaveV3MultiplyEthereum1.spec.ts b/tests/withWallet/aaveV3/ethereum/Multiply/aaveV3MultiplyEthereum1.spec.ts
@@ -55,7 +55,6 @@ test.describe('Aave v3 Multiply - Ethereum - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'DAI', amount: '15000.1234' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/ethereum/aaveV3BorrowEthereum.spec.ts b/tests/withWallet/aaveV3/ethereum/aaveV3BorrowEthereum.spec.ts
@@ -57,7 +57,6 @@ test.describe('Aave V3 Borrow - Ethereum - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'CBETH', amount: '7.5' },
 			borrow: { token: 'ETH', amount: '3' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/ethereum/aaveV3EarnEthereum.spec.ts b/tests/withWallet/aaveV3/ethereum/aaveV3EarnEthereum.spec.ts
@@ -60,7 +60,6 @@ test.describe('Aave V3 Earn - Ethereum - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'ETH', amount: '10' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/optimism/aaveV3BorrowOptimism.spec.ts b/tests/withWallet/aaveV3/optimism/aaveV3BorrowOptimism.spec.ts
@@ -52,7 +52,6 @@ test.describe('Aave V3 Borrow - Optimism - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'ETH', amount: '7.5' },
 			borrow: { token: 'USDC', amount: '2000' },
-			omni: { network: 'optimism' },
 		});
 	});
 

diff --git a/tests/withWallet/aaveV3/optimism/aaveV3MultiplyOptimism.spec.ts b/tests/withWallet/aaveV3/optimism/aaveV3MultiplyOptimism.spec.ts
@@ -47,7 +47,6 @@ test.describe('Aave v3 Multiply - Optimism - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'ETH', amount: '10.12345' },
-			omni: { network: 'optimism' },
 		});
 	});
 

diff --git a/tests/withWallet/ajna/arbitrum/ajnaArbitrumBorrow.spec.ts b/tests/withWallet/ajna/arbitrum/ajnaArbitrumBorrow.spec.ts
@@ -65,6 +65,7 @@ test.describe.skip('Ajna Arbitrum Borrow - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'RETH', amount: '0.1' },
 			borrow: { token: 'ETH', amount: '0.01' },
+			protocol: 'Ajna',
 		});
 	});
 

diff --git a/tests/withWallet/ajna/arbitrum/ajnaArbitrumEarn.spec.ts b/tests/withWallet/ajna/arbitrum/ajnaArbitrumEarn.spec.ts
@@ -69,6 +69,7 @@ test.describe('Ajna Arbitrum Earn - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'WBTC', amount: '1' },
 			adjustRisk: { value: 0.8 },
+			protocol: 'Ajna',
 		});
 	});
 

diff --git a/tests/withWallet/ajna/arbitrum/ajnaArbitrumMultiply.spec.ts b/tests/withWallet/ajna/arbitrum/ajnaArbitrumMultiply.spec.ts
@@ -61,6 +61,7 @@ test.describe.skip('Ajna Arbitrum Multiply - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'RETH', amount: '0.5' },
+			protocol: 'Ajna',
 		});
 	});
 });
diff --git a/tests/withWallet/ajna/base/ajnaBorrowBase.spec.ts b/tests/withWallet/ajna/base/ajnaBorrowBase.spec.ts
@@ -61,6 +61,7 @@ test.describe('Ajna Base Borrow - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'WSTETH', amount: '2' },
 			borrow: { token: 'ETH', amount: '1' },
+			protocol: 'Ajna',
 		});
 	});
 

diff --git a/tests/withWallet/ajna/base/ajnaEarnBase.spec.ts b/tests/withWallet/ajna/base/ajnaEarnBase.spec.ts
@@ -52,7 +52,12 @@ test.describe('Ajna Base Earn - Wallet connected', async () => {
 		await app.page.goto('/base/ajna/earn/ETH-USDC#setup');
 		await app.position.setup.acknowlegeAjnaInfo();
 
-		await openPosition({ app, forkId, deposit: { token: 'USDC', amount: '5000' } });
+		await openPosition({
+			app,
+			forkId,
+			deposit: { token: 'USDC', amount: '5000' },
+			protocol: 'Ajna',
+		});
 	});
 
 	test('It should allow to simulate an Ajna Base Earn position before opening it', async () => {

diff --git a/tests/withWallet/ajna/base/ajnaMultiplyBase.spec.ts b/tests/withWallet/ajna/base/ajnaMultiplyBase.spec.ts
@@ -56,6 +56,7 @@ test.describe('Ajna Base Multiply - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'ETH', amount: '15' },
+			protocol: 'Ajna',
 		});
 	});
 

diff --git a/tests/withWallet/ajna/ethereum/ajnaBorrowEthereum.spec.ts b/tests/withWallet/ajna/ethereum/ajnaBorrowEthereum.spec.ts
@@ -61,6 +61,7 @@ test.describe('Ajna Ethereum Borrow - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'RETH', amount: '2' },
 			borrow: { token: 'ETH', amount: '1.5' },
+			protocol: 'Ajna',
 		});
 	});
 

diff --git a/tests/withWallet/ajna/ethereum/ajnaEarnethereum.spec.ts b/tests/withWallet/ajna/ethereum/ajnaEarnethereum.spec.ts
@@ -43,7 +43,12 @@ test.describe('Ajna Ethereum Earn - Wallet connected', async () => {
 		await app.page.goto('/ethereum/ajna/earn/RETH-ETH#setup');
 		await app.position.setup.acknowlegeAjnaInfo();
 
-		await openPosition({ app, forkId, deposit: { token: 'ETH', amount: '20' } });
+		await openPosition({
+			app,
+			forkId,
+			deposit: { token: 'ETH', amount: '20' },
+			protocol: 'Ajna',
+		});
 	});
 
 	test('It should allow to simulate an Ajna Ethereum Earn position before opening it', async () => {

diff --git a/tests/withWallet/ajna/ethereum/ajnaMultiplyEthereum.spec.ts b/tests/withWallet/ajna/ethereum/ajnaMultiplyEthereum.spec.ts
@@ -52,7 +52,12 @@ test.describe('Ajna Ethereum Multiply - Wallet connected', async () => {
 		await app.page.goto('/ethereum/ajna/multiply/RETH-ETH#setup');
 		await app.position.setup.acknowlegeAjnaInfo();
 
-		await openPosition({ app, forkId, deposit: { token: 'RETH', amount: '2' } });
+		await openPosition({
+			app,
+			forkId,
+			deposit: { token: 'RETH', amount: '2' },
+			protocol: 'Ajna',
+		});
 	});
 
 	test('It should adjust risk of an existing Ajna Ethereum Multiply position - Up @regression', async () => {

diff --git a/tests/withWallet/ajna/optimism/ajnaOptimismEarn.spec.ts b/tests/withWallet/ajna/optimism/ajnaOptimismEarn.spec.ts
@@ -60,6 +60,7 @@ test.describe('Ajna Optimism Earn & Borrow - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'ETH', amount: '10' },
 			adjustRisk: { value: 0.8 },
+			protocol: 'Ajna',
 		});
 	});
 

diff --git a/tests/withWallet/morphoBlue/morphoBlueBorrow.spec.ts b/tests/withWallet/morphoBlue/morphoBlueBorrow.spec.ts
@@ -57,6 +57,7 @@ test.describe('Morpho Blue Borrow - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'WSTETH', amount: '10' },
 			borrow: { token: 'USDC', amount: '8000.12' },
+			protocol: 'Morpho Blue',
 		});
 	});
 

diff --git a/tests/withWallet/morphoBlue/morphoBlueMultiply.spec.ts b/tests/withWallet/morphoBlue/morphoBlueMultiply.spec.ts
@@ -157,6 +157,7 @@ test.describe('Morpho Blue Multiply - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'WSTETH', amount: '30.12345' },
+			protocol: 'Morpho Blue',
 		});
 	});
 

diff --git a/tests/withWallet/spark/earn/sparkEarn1.spec.ts b/tests/withWallet/spark/earn/sparkEarn1.spec.ts
@@ -63,7 +63,6 @@ test.describe('Spark Earn - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'RETH', amount: '7.5' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/spark/multiply/sparkMultiply2.spec.ts b/tests/withWallet/spark/multiply/sparkMultiply2.spec.ts
@@ -58,7 +58,6 @@ test.describe('Spark Multiply - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'SDAI', amount: '20000' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/spark/multiply/sparkMultiply3.spec.ts b/tests/withWallet/spark/multiply/sparkMultiply3.spec.ts
@@ -59,7 +59,6 @@ test.describe('Spark Multiply - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'ETH', amount: '10' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/spark/multiply/sparkMultiply4.spec.ts b/tests/withWallet/spark/multiply/sparkMultiply4.spec.ts
@@ -55,7 +55,6 @@ test.describe('Spark Multiply - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'WBTC', amount: '1' },
-			omni: { network: 'ethereum' },
 		});
 	});
 

diff --git a/tests/withWallet/spark/multiply/sparkMultiplyAutomations.spec.ts b/tests/withWallet/spark/multiply/sparkMultiplyAutomations.spec.ts
@@ -55,7 +55,6 @@ test.describe('Spark Multiply - Mainnet - Wallet connected', async () => {
 			app,
 			forkId,
 			deposit: { token: 'WBTC', amount: '1' },
-			omni: { network: 'ethereum' },
 			adjustRisk: { positionType: 'Borrow', value: 0.5 },
 		});
 	});

diff --git a/tests/withWallet/spark/sparkBorrow.spec.ts b/tests/withWallet/spark/sparkBorrow.spec.ts
@@ -51,7 +51,6 @@ test.describe('Spark Borrow - Wallet connected', async () => {
 			forkId,
 			deposit: { token: 'ETH', amount: '7.5' },
 			borrow: { token: 'DAI', amount: '5000' },
-			omni: { network: 'ethereum' },
 		});
 	});