Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed test with wrong descimals in uniswap liquidity swap

Browse Source
This commit is contained in:
Hadrien Charlanes 2021-05-20 12:17:47 +02:00
parent e18bd375cc
commit f3418670f8
1 changed files with 30 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
test-suites/test-aave/uniswapAdapters.liquiditySwap.spec.ts
View File

@ -187,17 +187,12 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
const collateralDecimals = (await usdc.decimals()).toString(); const collateralDecimals = (await usdc.decimals()).toString();
const principalDecimals = (await dai.decimals()).toString(); const principalDecimals = (await dai.decimals()).toString();
const expectedDaiAmountForUsdc = await convertToCurrencyDecimals( const expectedDaiAmountForUsdc = new BigNumber(amountUSDCtoSwap.toString())
dai.address,
new BigNumber(amountUSDCtoSwap.toString())
.times( .times(
new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals)) new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals))
) )
.div( .div(new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)))
new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)) .toFixed(0);
)
.toFixed(0)
);
// Make a deposit for user // Make a deposit for user
await usdc.connect(user).mint(amountUSDCtoSwap); await usdc.connect(user).mint(amountUSDCtoSwap);
@ -240,7 +235,6 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
], ],
[false, false] [false, false]
); );
await pool await pool
.connect(user) .connect(user)
.flashLoan( .flashLoan(
@ -309,17 +303,12 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
const collateralDecimals = (await usdc.decimals()).toString(); const collateralDecimals = (await usdc.decimals()).toString();
const principalDecimals = (await dai.decimals()).toString(); const principalDecimals = (await dai.decimals()).toString();
const expectedDaiAmountForUsdc = await convertToCurrencyDecimals( const expectedDaiAmountForUsdc = new BigNumber(amountUSDCtoSwap.toString())
dai.address,
new BigNumber(amountUSDCtoSwap.toString())
.times( .times(
new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals)) new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals))
) )
.div( .div(new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)))
new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)) .toFixed(0);
)
.toFixed(0)
);
// Make a deposit for user // Make a deposit for user
await usdc.connect(user).mint(amountUSDCtoSwap); await usdc.connect(user).mint(amountUSDCtoSwap);
@ -862,17 +851,12 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
const collateralDecimals = (await usdc.decimals()).toString(); const collateralDecimals = (await usdc.decimals()).toString();
const principalDecimals = (await dai.decimals()).toString(); const principalDecimals = (await dai.decimals()).toString();
const expectedDaiAmount = await convertToCurrencyDecimals( const expectedDaiAmount = new BigNumber(amountUSDCtoSwap.toString())
dai.address,
new BigNumber(amountUSDCtoSwap.toString())
.times( .times(
new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals)) new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals))
) )
.div( .div(new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)))
new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)) .toFixed(0);
)
.toFixed(0)
);
await mockUniswapRouter.connect(user).setAmountToReturn(usdc.address, expectedDaiAmount); await mockUniswapRouter.connect(user).setAmountToReturn(usdc.address, expectedDaiAmount);
@ -1484,17 +1468,12 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
const collateralDecimals = (await usdc.decimals()).toString(); const collateralDecimals = (await usdc.decimals()).toString();
const principalDecimals = (await dai.decimals()).toString(); const principalDecimals = (await dai.decimals()).toString();
const expectedDaiAmountForUsdc = await convertToCurrencyDecimals( const expectedDaiAmountForUsdc = new BigNumber(amountUSDCtoSwap.toString())
dai.address,
new BigNumber(amountUSDCtoSwap.toString())
.times( .times(
new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals)) new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals))
) )
.div( .div(new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)))
new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)) .toFixed(0);
)
.toFixed(0)
);
// Make a deposit for user // Make a deposit for user
await usdc.connect(user).mint(amountUSDCtoSwap); await usdc.connect(user).mint(amountUSDCtoSwap);
@ -1592,17 +1571,12 @@ makeSuite('Uniswap adapters', (testEnv: TestEnv) => {
const collateralDecimals = (await usdc.decimals()).toString(); const collateralDecimals = (await usdc.decimals()).toString();
const principalDecimals = (await dai.decimals()).toString(); const principalDecimals = (await dai.decimals()).toString();
const expectedDaiAmountForUsdc = await convertToCurrencyDecimals( const expectedDaiAmountForUsdc = new BigNumber(amountUSDCtoSwap.toString())
dai.address,
new BigNumber(amountUSDCtoSwap.toString())
.times( .times(
new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals)) new BigNumber(usdcPrice.toString()).times(new BigNumber(10).pow(principalDecimals))
) )
.div( .div(new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)))
new BigNumber(daiPrice.toString()).times(new BigNumber(10).pow(collateralDecimals)) .toFixed(0);
)
.toFixed(0)
);
// Make a deposit for user // Make a deposit for user
await usdc.connect(user).mint(amountUSDCtoSwap); await usdc.connect(user).mint(amountUSDCtoSwap);