Merge pull request #566 from OasisDEX/daily-improvements-15-oct-2

Daily improvements 15 oct 2
OasisDEX · Oct 15, 2024 · f02580b · f02580b
2 parents fc2b19b + 507d456
commit f02580b
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 85 deletions.
diff --git a/tests/withWallet/aaveV3/ethereum/swap/aaveToSpark/borrEthDaiToAny.spec.ts b/tests/withWallet/aaveV3/ethereum/swap/aaveToSpark/borrEthDaiToAny.spec.ts
@@ -74,12 +74,7 @@ test.describe('Aave V3 Borrow - Swap to Morpho', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'ETH', debtToken: 'DAI' },
-			{ colToken: 'SDAI', debtToken: 'ETH' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'WEETH', debtToken: 'DAI' }] as const).forEach((targetPool) =>
 		test(`It should swap an Aave V3 Borrow position (ETH/USDC) to Spark Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/aaveV3/ethereum/swap/aaveToSpark/multWstethUsdcToAny.spec.ts b/tests/withWallet/aaveV3/ethereum/swap/aaveToSpark/multWstethUsdcToAny.spec.ts
@@ -82,12 +82,7 @@ test.describe('Aave V3 Multiply - Swap to Spark', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'WEETH', debtToken: 'DAI' },
-			{ colToken: 'WSTETH', debtToken: 'DAI' },
-		] as const
-	).forEach((targetPool) =>
+	([, { colToken: 'WSTETH', debtToken: 'DAI' }] as const).forEach((targetPool) =>
 		test(`It should swap an Aave V3 Multiply position (ETH/DAI) to Spark Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrEth_B_DaiToAny.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrEth_B_DaiToAny.spec.ts
@@ -78,7 +78,6 @@ test.describe.skip('Maker Borrow - Swap to Aave V3', async () => {
 	(
 		[
 			{ colToken: 'ETH', debtToken: 'USDC' },
-			{ colToken: 'ETH', debtToken: 'WBTC' },
 			{ colToken: 'WBTC', debtToken: 'USDC' },
 			// { colToken: 'WSTETH', debtToken: 'GHO' }, - NO LIQUIDITY - GHO
 		] as const

diff --git a/tests/withWallet/maker/swap/makerToAave/toAny/borrWsteth_A_DaiToAny.spec.ts b/tests/withWallet/maker/swap/makerToAave/toAny/borrWsteth_A_DaiToAny.spec.ts
@@ -86,7 +86,6 @@ test.describe.skip('Maker Borrow - Swap to Aave V3', async () => {
 
 	(
 		[
-			{ colToken: 'SDAI', debtToken: 'ETH' },
 			{ colToken: 'USDC', debtToken: 'WSTETH' }, // BUG - 16003
 		] as const
 	).forEach((targetPool) =>

diff --git a/tests/withWallet/maker/swap/makerToMorpho/multEth_A_DaiToAny.spec.ts b/tests/withWallet/maker/swap/makerToMorpho/multEth_A_DaiToAny.spec.ts
@@ -75,9 +75,7 @@ test.describe('Maker Multiply - Swap to Morpho', async () => {
 
 	(
 		[
-			{ colToken: 'WSTETH', debtToken: 'USDC' },
 			{ colToken: 'USDE', debtToken: 'DAI-4' },
-			{ colToken: 'WBTC', debtToken: 'USDC' },
 			// { colToken: 'WOETH', debtToken: 'ETH' }, --> NO LIQUIDITY
 		] as const
 	).forEach((targetPool) =>

diff --git a/tests/withWallet/maker/swap/makerToMorpho/multWsteth_A_DaiToAny.spec.ts b/tests/withWallet/maker/swap/makerToMorpho/multWsteth_A_DaiToAny.spec.ts
@@ -82,13 +82,7 @@ test.describe('Maker Borrow - Swap to Morpho', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'WBTC', debtToken: 'USDT' },
-			{ colToken: 'WSTETH', debtToken: 'ETH-2' },
-			{ colToken: 'RSWETH', debtToken: 'ETH' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'RSWETH', debtToken: 'ETH' }] as const).forEach((targetPool) =>
 		test(`It should swap a Maker Multiply position (WSTETH-A/DAI) to Morpho Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/maker/swap/makerToSpark/multEth_C_DaiToAny.spec.ts b/tests/withWallet/maker/swap/makerToSpark/multEth_C_DaiToAny.spec.ts
@@ -73,12 +73,7 @@ test.describe('Maker Multiply - Swap to Spark', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'ETH', debtToken: 'DAI' },
-			{ colToken: 'SDAI', debtToken: 'ETH' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'SDAI', debtToken: 'ETH' }] as const).forEach((targetPool) =>
 		test(`It should swap a Maker Multiply position (ETH-C/DAI) to Spark Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/morphoBlue/ethereum/swap/morphoToAave/borrSusdeDai2ToAny.spec.ts b/tests/withWallet/morphoBlue/ethereum/swap/morphoToAave/borrSusdeDai2ToAny.spec.ts
@@ -86,8 +86,6 @@ test.describe.skip('Morpho Blue Borrow - Swap to Aave V3', async () => {
 
 	(
 		[
-			{ colToken: 'ETH', debtToken: 'DAI' },
-			{ colToken: 'ETH', debtToken: 'USDC' },
 			{ colToken: 'ETH', debtToken: 'WBTC' },
 			{ colToken: 'ETH', debtToken: 'USDT' },
 			{ colToken: 'LDO', debtToken: 'USDT' }, // BUG - 15943 - NOT working

diff --git a/tests/withWallet/morphoBlue/ethereum/swap/morphoToAave/borrUsdeDai3ToAny.spec.ts b/tests/withWallet/morphoBlue/ethereum/swap/morphoToAave/borrUsdeDai3ToAny.spec.ts
@@ -75,11 +75,8 @@ test.describe.skip('Morpho Blue Borrow - Swap to Aave V3', async () => {
 	(
 		[
 			{ colToken: 'WBTC', debtToken: 'DAI' },
-			{ colToken: 'WBTC', debtToken: 'ETH' },
 			{ colToken: 'WBTC', debtToken: 'LUSD' },
-			{ colToken: 'WBTC', debtToken: 'USDC' },
 			{ colToken: 'WBTC', debtToken: 'USDT' },
-			{ colToken: 'WSTETH', debtToken: 'CBETH' },
 		] as const
 	).forEach((targetPool) =>
 		test(`It should swap a Morpho Borrow position (WSTETH/USDC) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {

diff --git a/tests/withWallet/morphoBlue/ethereum/swap/morphoToMorpho/borrSusdeDai1ToAny.spec.ts b/tests/withWallet/morphoBlue/ethereum/swap/morphoToMorpho/borrSusdeDai1ToAny.spec.ts
@@ -86,7 +86,6 @@ test.describe('Morpho Blue Borrow - Swap to Morpho', async () => {
 	(
 		[
 			{ colToken: 'WBTC', debtToken: 'USDC' },
-			{ colToken: 'WBTC', debtToken: 'USDT' },
 			{ colToken: 'WSTETH', debtToken: 'ETH-1' },
 		] as const
 	).forEach((targetPool) =>

diff --git a/tests/withWallet/morphoBlue/ethereum/swap/morphoToMorpho/borrUsdeDai1ToAny.spec.ts b/tests/withWallet/morphoBlue/ethereum/swap/morphoToMorpho/borrUsdeDai1ToAny.spec.ts
@@ -83,13 +83,7 @@ test.describe('Morpho Blue Borrow - Swap to Morpho', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'WSTETH', debtToken: 'ETH-2' },
-			{ colToken: 'WSTETH', debtToken: 'ETH-3' },
-			{ colToken: 'WSTETH', debtToken: 'USDT' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'WSTETH', debtToken: 'ETH-3' }] as const).forEach((targetPool) =>
 		test(`It should swap a Morpho Borrow position (WEETH/ETH) to Morpho Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/morphoBlue/ethereum/swap/morphoToSpark/borrWstethUsdtToAny.spec.ts b/tests/withWallet/morphoBlue/ethereum/swap/morphoToSpark/borrWstethUsdtToAny.spec.ts
@@ -83,12 +83,7 @@ test.describe('Morpho Blue Borrow - Swap to Spark', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'RETH', debtToken: 'DAI' },
-			{ colToken: 'SDAI', debtToken: 'ETH' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'RETH', debtToken: 'DAI' }] as const).forEach((targetPool) =>
 		test(`It should swap a Morpho Borrow position (WEETH/ETH) to Spark Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/spark/swap/sparkToAave/borrSdaiEthToMultAny.spec.ts b/tests/withWallet/spark/swap/sparkToAave/borrSdaiEthToMultAny.spec.ts
@@ -82,12 +82,7 @@ test.describe.skip('Spark Borrow - Swap to Aave V3', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'WBTC', debtToken: 'ETH' },
-			{ colToken: 'WBTC', debtToken: 'USDC' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'WBTC', debtToken: 'ETH' }] as const).forEach((targetPool) =>
 		test(`It should swap a Spark Borrow position (SDAI/ETH) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/spark/swap/sparkToAave/borrWstethDaiToMultAny.spec.ts b/tests/withWallet/spark/swap/sparkToAave/borrWstethDaiToMultAny.spec.ts
@@ -82,13 +82,7 @@ test.describe.skip('Spark Borrow - Swap to Aave V3', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'WSTETH', debtToken: 'CBETH' },
-			{ colToken: 'WSTETH', debtToken: 'DAI' },
-			{ colToken: 'WSTETH', debtToken: 'LUSD' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'WSTETH', debtToken: 'CBETH' }] as const).forEach((targetPool) =>
 		test(`It should swap a Spark Borrow position (WSTETH/DAI) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/spark/swap/sparkToAave/multRethDaiToMultAny.spec.ts b/tests/withWallet/spark/swap/sparkToAave/multRethDaiToMultAny.spec.ts
@@ -71,12 +71,7 @@ test.describe.skip('Spark Multiply - Swap to Aave V3', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'LINK', debtToken: 'ETH' },
-			{ colToken: 'USDC', debtToken: 'WBTC' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'USDC', debtToken: 'WBTC' }] as const).forEach((targetPool) =>
 		test(`It should swap a Spark Multiply position (RETH/DAI) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/spark/swap/sparkToAave/multWeethDaiToMultAny.spec.ts b/tests/withWallet/spark/swap/sparkToAave/multWeethDaiToMultAny.spec.ts
@@ -71,12 +71,7 @@ test.describe.skip('Spark Multiply - Swap to Aave V3', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'USDT', debtToken: 'ETH' },
-			{ colToken: 'DAI', debtToken: 'WBTC' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'DAI', debtToken: 'WBTC' }] as const).forEach((targetPool) =>
 		test(`It should swap a Spark Multiply position (WEETH/DAI) to Aave V3 Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/spark/swap/sparkToMorpho/borrEthDaiToMultAny.spec.ts b/tests/withWallet/spark/swap/sparkToMorpho/borrEthDaiToMultAny.spec.ts
@@ -74,12 +74,7 @@ test.describe('Spark Borrow - Swap to Morpho', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'USDE', debtToken: 'DAI-1' },
-			{ colToken: 'WSTETH', debtToken: 'ETH-1' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'USDE', debtToken: 'DAI-1' }] as const).forEach((targetPool) =>
 		test(`It should swap a Spark Borrow position (ETH/DAI) to Morpho Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',

diff --git a/tests/withWallet/spark/swap/sparkToMorpho/borrWeethDaiToMultAny.spec.ts b/tests/withWallet/spark/swap/sparkToMorpho/borrWeethDaiToMultAny.spec.ts
@@ -83,12 +83,7 @@ test.describe('Spark Borrow - Swap to Morpho', async () => {
 		});
 	});
 
-	(
-		[
-			{ colToken: 'WBTC', debtToken: 'USDC' },
-			{ colToken: 'SUSDE', debtToken: 'USDT' },
-		] as const
-	).forEach((targetPool) =>
+	([{ colToken: 'SUSDE', debtToken: 'USDT' }] as const).forEach((targetPool) =>
 		test(`It should swap a Spark Borrow position (ETH/DAI) to Morpho Multiply (${targetPool.colToken}/${targetPool.debtToken})`, async () => {
 			test.info().annotations.push({
 				type: 'Test case',