Skip to content

Commit dd00372

Browse files
defispartandefispartan
committed
Revert "feat: paraswap feature updates (#1219)"
This reverts commit 2c7dd52.
1 parent ea5ef49 commit dd00372

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+837
-2196
lines changed

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/dai.aave-v2.cy.ts‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
{
63-
asset: assets.aaveMarket.DAI,
64-
apyType: constants.apyType.stable,
65-
amount: 10,
66-
hasApproval: false,
67-
repayOption: constants.repayType.collateral,
68-
},
62+
// {
63+
// asset: assets.aaveMarket.DAI,
64+
// apyType: constants.apyType.stable,
65+
// amount: 10,
66+
// hasApproval: false,
67+
// repayOption: constants.repayType.collateral,
68+
// assetForRepay: assets.aaveMarket.BAT,
69+
// },
6970
],
7071
withdraw: {
7172
asset: assets.aaveMarket.DAI,
@@ -80,6 +81,7 @@ const testData = {
8081
type: constants.dashboardTypes.deposit,
8182
assetName: assets.aaveMarket.DAI.shortName,
8283
wrapped: assets.aaveMarket.DAI.wrapped,
84+
// amount: 30,
8385
amount: 40,
8486
collateralType: constants.collateralType.isCollateral,
8587
isCollateral: true,
@@ -88,7 +90,8 @@ const testData = {
8890
type: constants.dashboardTypes.borrow,
8991
assetName: assets.aaveMarket.DAI.shortName,
9092
wrapped: assets.aaveMarket.DAI.wrapped,
91-
amount: 80,
93+
// amount: 80,
94+
amount: 90,
9295
apyType: constants.borrowAPYType.stable,
9396
},
9497
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/ren.aave-v2.cy.ts‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
{
63-
asset: assets.aaveMarket.REN,
64-
apyType: constants.apyType.stable,
65-
amount: 20,
66-
hasApproval: false,
67-
repayOption: constants.repayType.collateral,
68-
},
62+
// {
63+
// asset: assets.aaveMarket.REN,
64+
// apyType: constants.apyType.stable,
65+
// amount: 20,
66+
// hasApproval: false,
67+
// repayOption: constants.repayType.collateral,
68+
// assetForRepay: assets.aaveMarket.BAT,
69+
// },
6970
],
7071
withdraw: {
7172
asset: assets.aaveMarket.REN,
@@ -80,6 +81,7 @@ const testData = {
8081
type: constants.dashboardTypes.deposit,
8182
assetName: assets.aaveMarket.REN.shortName,
8283
wrapped: assets.aaveMarket.REN.wrapped,
84+
// amount: 60,
8385
amount: 80,
8486
collateralType: constants.collateralType.isCollateral,
8587
isCollateral: true,
@@ -88,7 +90,8 @@ const testData = {
8890
type: constants.dashboardTypes.borrow,
8991
assetName: assets.aaveMarket.REN.shortName,
9092
wrapped: assets.aaveMarket.REN.wrapped,
91-
amount: 160,
93+
// amount: 160,
94+
amount: 180,
9295
apyType: constants.borrowAPYType.stable,
9396
},
9497
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/tusd.aave-v2.cy.ts‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
{
63-
asset: assets.aaveMarket.TUSD,
64-
apyType: constants.apyType.stable,
65-
amount: 10,
66-
hasApproval: false,
67-
repayOption: constants.repayType.collateral,
68-
},
62+
// {
63+
// asset: assets.aaveMarket.TUSD,
64+
// apyType: constants.apyType.stable,
65+
// amount: 10,
66+
// hasApproval: false,
67+
// repayOption: constants.repayType.collateral,
68+
// assetForRepay: assets.aaveMarket.TUSD,
69+
// },
6970
],
7071
withdraw: {
7172
asset: assets.aaveMarket.TUSD,
@@ -80,6 +81,7 @@ const testData = {
8081
type: constants.dashboardTypes.deposit,
8182
assetName: assets.aaveMarket.TUSD.shortName,
8283
wrapped: assets.aaveMarket.TUSD.wrapped,
84+
// amount: 30,
8385
amount: 40,
8486
collateralType: constants.collateralType.isCollateral,
8587
isCollateral: true,
@@ -88,7 +90,8 @@ const testData = {
8890
type: constants.dashboardTypes.borrow,
8991
assetName: assets.aaveMarket.TUSD.shortName,
9092
wrapped: assets.aaveMarket.TUSD.wrapped,
91-
amount: 80,
93+
// amount: 80,
94+
amount: 90,
9295
apyType: constants.borrowAPYType.stable,
9396
},
9497
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/usdc.aave-v2.cy.ts‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,14 @@ const testData = {
5959
hasApproval: true,
6060
repayOption: constants.repayType.default,
6161
},
62-
{
63-
asset: assets.aaveMarket.USDC,
64-
apyType: constants.apyType.stable,
65-
amount: 10,
66-
hasApproval: false,
67-
repayOption: constants.repayType.collateral,
68-
},
62+
// {
63+
// asset: assets.aaveMarket.USDC,
64+
// apyType: constants.apyType.stable,
65+
// amount: 10,
66+
// hasApproval: false,
67+
// repayOption: constants.repayType.collateral,
68+
// assetForRepay: assets.aaveMarket.USDC,
69+
// },
6970
],
7071
withdraw: {
7172
asset: assets.aaveMarket.USDC,
@@ -80,6 +81,7 @@ const testData = {
8081
type: constants.dashboardTypes.deposit,
8182
assetName: assets.aaveMarket.USDC.shortName,
8283
wrapped: assets.aaveMarket.USDC.wrapped,
84+
// amount: 30,
8385
amount: 40,
8486
collateralType: constants.collateralType.isCollateral,
8587
isCollateral: true,
@@ -88,7 +90,8 @@ const testData = {
8890
type: constants.dashboardTypes.borrow,
8991
assetName: assets.aaveMarket.USDC.shortName,
9092
wrapped: assets.aaveMarket.USDC.wrapped,
91-
amount: 80,
93+
// amount: 80,
94+
amount: 90,
9295
apyType: constants.borrowAPYType.stable,
9396
},
9497
],

‎cypress/e2e/0-v2-markets/0-main-v2-market/0-assets/usdt.aave-v2.cy.ts‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,14 @@ const testData = {
6262
hasApproval: true,
6363
repayOption: constants.repayType.default,
6464
},
65-
{
66-
asset: assets.aaveMarket.USDT,
67-
apyType: constants.apyType.stable,
68-
amount: 10,
69-
hasApproval: false,
70-
repayOption: constants.repayType.collateral,
71-
},
65+
// {
66+
// asset: assets.aaveMarket.USDT,
67+
// apyType: constants.apyType.stable,
68+
// amount: 10,
69+
// hasApproval: false,
70+
// repayOption: constants.repayType.collateral,
71+
// assetForRepay: assets.aaveMarket.USDT,
72+
// },
7273
],
7374
withdraw: {
7475
asset: assets.aaveMarket.USDT,
@@ -87,6 +88,7 @@ const testData = {
8788
type: constants.dashboardTypes.deposit,
8889
assetName: assets.aaveMarket.USDT.shortName,
8990
wrapped: assets.aaveMarket.USDT.wrapped,
91+
// amount: 30,
9092
amount: 40,
9193
collateralType: constants.collateralType.isCollateral,
9294
isCollateral: false,
@@ -95,7 +97,8 @@ const testData = {
9597
type: constants.dashboardTypes.borrow,
9698
assetName: assets.aaveMarket.USDT.shortName,
9799
wrapped: assets.aaveMarket.USDT.wrapped,
98-
amount: 80,
100+
// amount: 80,
101+
amount: 90,
99102
apyType: constants.borrowAPYType.stable,
100103
},
101104
],

‎cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/usdc.polygon-v2.cy.ts‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,13 @@ const testData = {
2222
amount: 10,
2323
hasApproval: false,
2424
},
25-
repay: [
26-
{
27-
asset: assets.polygonMarket.USDC,
28-
apyType: constants.apyType.variable,
29-
amount: 2,
30-
hasApproval: true,
31-
repayOption: constants.repayType.default,
32-
},
33-
{
34-
asset: assets.polygonMarket.USDC,
35-
apyType: constants.apyType.variable,
36-
amount: 2,
37-
hasApproval: false,
38-
repayOption: constants.repayType.collateral,
39-
},
40-
],
25+
repay: {
26+
asset: assets.polygonMarket.USDC,
27+
apyType: constants.apyType.variable,
28+
amount: 2,
29+
hasApproval: true,
30+
repayOption: constants.repayType.default,
31+
},
4132
withdraw: {
4233
asset: assets.polygonMarket.USDC,
4334
isCollateral: true,
@@ -59,7 +50,7 @@ const testData = {
5950
type: constants.dashboardTypes.borrow,
6051
assetName: assets.polygonMarket.USDC.shortName,
6152
wrapped: assets.polygonMarket.USDC.wrapped,
62-
amount: 21.0,
53+
amount: 23.0,
6354
apyType: constants.borrowAPYType.variable,
6455
},
6556
],
@@ -73,9 +64,7 @@ describe('USDC INTEGRATION SPEC, POLYGON V2 MARKET', () => {
7364
supply(testData.depositBaseAmount, skipTestState, true);
7465
borrow(testData.testCases.borrow, skipTestState, true);
7566
supply(testData.testCases.deposit, skipTestState, true);
76-
testData.testCases.repay.forEach((repayCase) => {
77-
repay(repayCase, skipTestState, false);
78-
});
67+
repay(testData.testCases.repay, skipTestState, false);
7968
withdraw(testData.testCases.withdraw, skipTestState, false);
8069
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);
8170
});

‎cypress/e2e/0-v2-markets/2-polygon-v2-market/0-assets/usdt.polygon-v2.cy.ts‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,13 @@ const testData = {
2525
amount: 10,
2626
hasApproval: false,
2727
},
28-
repay: [
29-
{
30-
asset: assets.polygonMarket.USDT,
31-
apyType: constants.apyType.variable,
32-
amount: 2,
33-
hasApproval: true,
34-
repayOption: constants.repayType.default,
35-
},
36-
{
37-
asset: assets.polygonMarket.USDT,
38-
apyType: constants.apyType.variable,
39-
amount: 2,
40-
hasApproval: false,
41-
repayOption: constants.repayType.collateral,
42-
},
43-
],
28+
repay: {
29+
asset: assets.polygonMarket.USDT,
30+
apyType: constants.apyType.variable,
31+
amount: 2,
32+
hasApproval: true,
33+
repayOption: constants.repayType.default,
34+
},
4435
withdraw: {
4536
asset: assets.polygonMarket.USDT,
4637
isCollateral: false,
@@ -66,7 +57,7 @@ const testData = {
6657
type: constants.dashboardTypes.borrow,
6758
assetName: assets.polygonMarket.USDT.shortName,
6859
wrapped: assets.polygonMarket.USDT.wrapped,
69-
amount: 21.0,
60+
amount: 23.0,
7061
apyType: constants.borrowAPYType.variable,
7162
},
7263
],
@@ -80,9 +71,7 @@ describe('USDT INTEGRATION SPEC, POLYGON MARKET', () => {
8071
supply(testData.depositBaseAmount, skipTestState, true);
8172
borrow(testData.testCases.borrow, skipTestState, true);
8273
supply(testData.testCases.deposit, skipTestState, true);
83-
testData.testCases.repay.forEach((repayCase) => {
84-
repay(repayCase, skipTestState, false);
85-
});
74+
repay(testData.testCases.repay, skipTestState, false);
8675
withdraw(testData.testCases.withdraw, skipTestState, false);
8776
changeBorrowTypeBlocked(testData.testCases.checkDisabledCollateral, skipTestState);
8877
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);

‎cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdc.avalanche-v2.cy.ts‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,13 @@ const testData = {
2525
amount: 10,
2626
hasApproval: false,
2727
},
28-
repay: [
29-
{
30-
asset: assets.avalancheMarket.USDC,
31-
apyType: constants.apyType.variable,
32-
amount: 2,
33-
hasApproval: true,
34-
repayOption: constants.repayType.default,
35-
},
36-
{
37-
asset: assets.avalancheMarket.USDC,
38-
apyType: constants.apyType.variable,
39-
amount: 2,
40-
hasApproval: false,
41-
repayOption: constants.repayType.collateral,
42-
},
43-
],
28+
repay: {
29+
asset: assets.avalancheMarket.USDC,
30+
apyType: constants.apyType.variable,
31+
amount: 2,
32+
hasApproval: true,
33+
repayOption: constants.repayType.default,
34+
},
4435
withdraw: {
4536
asset: assets.avalancheMarket.USDC,
4637
isCollateral: true,
@@ -66,7 +57,7 @@ const testData = {
6657
type: constants.dashboardTypes.borrow,
6758
assetName: assets.avalancheMarket.USDC.shortName,
6859
wrapped: assets.avalancheMarket.USDC.wrapped,
69-
amount: 21.0,
60+
amount: 23.0,
7061
apyType: constants.borrowAPYType.variable,
7162
},
7263
],
@@ -80,9 +71,7 @@ describe('USDC INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
8071
supply(testData.depositBaseAmount, skipTestState, true);
8172
borrow(testData.testCases.borrow, skipTestState, true);
8273
supply(testData.testCases.deposit, skipTestState, true);
83-
testData.testCases.repay.forEach((repayCase) => {
84-
repay(repayCase, skipTestState, false);
85-
});
74+
repay(testData.testCases.repay, skipTestState, false);
8675
withdraw(testData.testCases.withdraw, skipTestState, false);
8776
switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
8877
dashboardAssetValuesVerification(testData.verifications.finalDashboard, skipTestState);

‎cypress/e2e/0-v2-markets/3-avalanche-v2-market/0-assets/usdt.avalanche-v2.cy.ts‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,13 @@ const testData = {
2626
amount: 10,
2727
hasApproval: false,
2828
},
29-
repay: [
30-
{
31-
asset: assets.avalancheMarket.USDT,
32-
apyType: constants.apyType.variable,
33-
amount: 2,
34-
hasApproval: true,
35-
repayOption: constants.repayType.default,
36-
},
37-
{
38-
asset: assets.avalancheMarket.USDT,
39-
apyType: constants.apyType.variable,
40-
amount: 2,
41-
hasApproval: false,
42-
repayOption: constants.repayType.collateral,
43-
},
44-
],
29+
repay: {
30+
asset: assets.avalancheMarket.USDT,
31+
apyType: constants.apyType.variable,
32+
amount: 2,
33+
hasApproval: true,
34+
repayOption: constants.repayType.default,
35+
},
4536
withdraw: {
4637
asset: assets.avalancheMarket.USDT,
4738
isCollateral: false,
@@ -71,7 +62,7 @@ const testData = {
7162
type: constants.dashboardTypes.borrow,
7263
assetName: assets.avalancheMarket.USDT.shortName,
7364
wrapped: assets.avalancheMarket.USDT.wrapped,
74-
amount: 21.0,
65+
amount: 23.0,
7566
apyType: constants.borrowAPYType.variable,
7667
},
7768
],
@@ -85,9 +76,7 @@ describe('USDT INTEGRATION SPEC, AVALANCHE V2 MARKET', () => {
8576
supply(testData.depositBaseAmount, skipTestState, true);
8677
borrow(testData.testCases.borrow, skipTestState, true);
8778
supply(testData.testCases.deposit, skipTestState, true);
88-
testData.testCases.repay.forEach((repayCase) => {
89-
repay(repayCase, skipTestState, false);
90-
});
79+
repay(testData.testCases.repay, skipTestState, false);
9180
withdraw(testData.testCases.withdraw, skipTestState, false);
9281
switchApyBlocked(testData.testCases.checkDisabledApy, skipTestState);
9382
changeBorrowTypeBlocked(testData.testCases.checkBorrowTypeBlocked, skipTestState);

0 commit comments

Comments
 (0)