Skip to content

Commit

Permalink
fix: Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelmtzinf committed Mar 5, 2024
1 parent 6e78cf3 commit 3380e6f
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 20 deletions.
5 changes: 5 additions & 0 deletions test/helpers/make-suite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ export async function initializeMakeSuite() {
testEnv.weth = await getWETHMocked(wethAddress);
testEnv.WrappedTokenGatewayV3 = await getWrappedTokenGateway();

const testnetTokens = await getSubTokensByPrefix(TESTNET_REWARD_TOKEN_PREFIX);

// Added extra reward token
await hre.deployments.deploy(`EXTRA${TESTNET_REWARD_TOKEN_PREFIX}`, {
from: await _deployer.getAddress(),
Expand Down Expand Up @@ -282,13 +284,16 @@ export async function initializeMakeSuite() {
);

// Support direct minting
const testnetTokensAddresses = testnetTokens.map(({ artifact }) => artifact.address);
await waitForTx(await testEnv.faucetMintable.setProtectedOfChild(testnetTokensAddresses, false));
await waitForTx(
await testEnv.faucetMintable.setProtectedOfChild(
[
testEnv.aave.address,
testEnv.dai.address,
testEnv.usdc.address,
testEnv.rewardToken.address,
testEnv.weth.address,
],
false
)
Expand Down
24 changes: 12 additions & 12 deletions test/paraswap/paraswapAdapters.liquiditySwap.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
await dai.approve(pool.address, parseEther('20000'));
await pool.deposit(dai.address, parseEther('20000'), deployer.address, 0);

await weth['mint(uint256)'](parseEther('10000'));
await weth['mint(address,uint256)'](deployer.address, parseEther('10000'));
await weth.approve(pool.address, parseEther('10000'));
await pool.deposit(weth.address, parseEther('10000'), deployer.address, 0);

// Make a deposit for user
await weth['mint(uint256)'](parseEther('100'));
await weth['mint(address,uint256)'](deployer.address, parseEther('100'));
await weth.approve(pool.address, parseEther('100'));
await pool.deposit(weth.address, parseEther('100'), userAddress, 0);
});
Expand Down Expand Up @@ -913,13 +913,13 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
});

it('should not touch any token balance already in the adapter', async () => {
const { users, weth, oracle, dai, aDai, aWETH, pool } = testEnv;
const { users, weth, oracle, dai, aDai, aWETH, pool, deployer } = testEnv;
const user = users[0].signer;
const userAddress = users[0].address;

// Put token balances in the adapter
const adapterWethBalanceBefore = parseEther('123');
await weth['mint(uint256)'](adapterWethBalanceBefore);
await weth['mint(address,uint256)'](deployer.address, adapterWethBalanceBefore);
await weth.transfer(paraswapLiquiditySwapAdapter.address, adapterWethBalanceBefore);
const adapterDaiBalanceBefore = parseEther('234');
await dai['mint(uint256)'](adapterDaiBalanceBefore);
Expand Down Expand Up @@ -1008,12 +1008,12 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
await dai.approve(pool.address, parseEther('20000'));
await pool.deposit(dai.address, parseEther('20000'), deployer.address, 0);

await weth['mint(uint256)'](parseEther('10000'));
await weth['mint(address,uint256)'](deployer.address, parseEther('10000'));
await weth.approve(pool.address, parseEther('10000'));
await pool.deposit(weth.address, parseEther('10000'), deployer.address, 0);

// Make a deposit for user
await weth['mint(uint256)'](parseEther('100'));
await weth['mint(address,uint256)'](deployer.address, parseEther('100'));
await weth.approve(pool.address, parseEther('100'));
await pool.deposit(weth.address, parseEther('100'), userAddress, 0);

Expand Down Expand Up @@ -1388,12 +1388,12 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
await dai.approve(pool.address, parseEther('20000'));
await pool.deposit(dai.address, parseEther('20000'), deployer.address, 0);

await weth['mint(uint256)'](parseEther('10000'));
await weth['mint(address,uint256)'](deployer.address, parseEther('10000'));
await weth.approve(pool.address, parseEther('10000'));
await pool.deposit(weth.address, parseEther('10000'), deployer.address, 0);

// Make a deposit for user
await weth['mint(uint256)'](parseEther('100'));
await weth['mint(address,uint256)'](deployer.address, parseEther('100'));
await weth.approve(pool.address, parseEther('100'));
await pool.deposit(weth.address, parseEther('100'), userAddress, 0);
});
Expand Down Expand Up @@ -2200,13 +2200,13 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
});

it('should not touch any token balance already in the adapter', async () => {
const { users, weth, oracle, dai, aDai, aWETH } = testEnv;
const { users, weth, oracle, dai, aDai, aWETH, deployer } = testEnv;
const user = users[0].signer;
const userAddress = users[0].address;

// Put token balances in the adapter
const adapterWethBalanceBefore = parseEther('123');
await weth['mint(uint256)'](adapterWethBalanceBefore);
await weth['mint(address,uint256)'](deployer.address, adapterWethBalanceBefore);
await weth.transfer(paraswapLiquiditySwapAdapter.address, adapterWethBalanceBefore);
const adapterDaiBalanceBefore = parseEther('234');
await dai['mint(uint256)'](adapterDaiBalanceBefore);
Expand Down Expand Up @@ -2290,12 +2290,12 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
await dai.approve(pool.address, parseEther('20000'));
await pool.deposit(dai.address, parseEther('20000'), deployer.address, 0);

await weth['mint(uint256)'](parseEther('10000'));
await weth['mint(address,uint256)'](deployer.address, parseEther('10000'));
await weth.approve(pool.address, parseEther('10000'));
await pool.deposit(weth.address, parseEther('10000'), deployer.address, 0);

// Make a deposit for user
await weth['mint(uint256)'](parseEther('100'));
await weth['mint(address,uint256)'](deployer.address, parseEther('100'));
await weth.approve(pool.address, parseEther('100'));
await pool.deposit(weth.address, parseEther('100'), userAddress, 0);

Expand Down
8 changes: 4 additions & 4 deletions test/paraswap/paraswapAdapters.repay.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ makeSuite('Paraswap adapters', (testEnv: TestEnv) => {
await usdc.approve(pool.address, usdcLiquidity);
await pool.deposit(usdc.address, usdcLiquidity, deployer.address, 0);

await weth['mint(uint256)'](parseEther('100'));
await weth['mint(address,uint256)'](deployer.address, parseEther('100'));
await weth.approve(pool.address, parseEther('100'));
await pool.deposit(weth.address, parseEther('100'), deployer.address, 0);

Expand All @@ -82,7 +82,7 @@ makeSuite('Paraswap adapters', (testEnv: TestEnv) => {
await pool.deposit(aave.address, parseEther('1000000'), deployer.address, 0);

// Make a deposit for user
await weth['mint(uint256)'](parseEther('1000'));
await weth['mint(address,uint256)'](deployer.address, parseEther('1000'));
await weth.approve(pool.address, parseEther('1000'));
await pool.deposit(weth.address, parseEther('1000'), userAddress, 0);

Expand Down Expand Up @@ -410,7 +410,7 @@ makeSuite('Paraswap adapters', (testEnv: TestEnv) => {

const amountWETHtoSwap = await parseUnitsFromToken(weth.address, '10');

await weth.connect(user)['mint(uint256)'](amountWETHtoSwap);
await weth.connect(user)['mint(address,uint256)'](userAddress, amountWETHtoSwap);
await weth.connect(user).transfer(paraswapRepayAdapter.address, amountWETHtoSwap);

const daiPrice = await oracle.getAssetPrice(dai.address);
Expand Down Expand Up @@ -479,7 +479,7 @@ makeSuite('Paraswap adapters', (testEnv: TestEnv) => {

const amountWETHtoSwap = await parseUnitsFromToken(weth.address, '10');

await weth.connect(user)['mint(uint256)'](amountWETHtoSwap);
await weth.connect(user)['mint(address,uint256)'](userAddress, amountWETHtoSwap);
await weth.connect(user).transfer(paraswapRepayAdapter.address, amountWETHtoSwap);

const daiPrice = await oracle.getAssetPrice(dai.address);
Expand Down
8 changes: 4 additions & 4 deletions test/paraswap/paraswapAdapters.withdrawSwap.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
await dai.approve(pool.address, parseEther('20000'));
await pool.deposit(dai.address, parseEther('20000'), deployer.address, 0);

await weth['mint(uint256)'](parseEther('10000'));
await weth['mint(address,uint256)'](deployer.address, parseEther('10000'));
await weth.approve(pool.address, parseEther('10000'));
await pool.deposit(weth.address, parseEther('10000'), deployer.address, 0);

// Make a deposit for user
await weth['mint(uint256)'](parseEther('100'));
await weth['mint(address,uint256)'](deployer.address, parseEther('100'));
await weth.approve(pool.address, parseEther('100'));
await pool.deposit(weth.address, parseEther('100'), userAddress, 0);
});
Expand Down Expand Up @@ -890,13 +890,13 @@ makeSuite('ParaSwap adapters', (testEnv: TestEnv) => {
});

it('should not touch any token balance already in the adapter', async () => {
const { users, weth, oracle, dai, aWETH } = testEnv;
const { users, weth, oracle, dai, aWETH, deployer } = testEnv;
const user = users[0].signer;
const userAddress = users[0].address;

// Put token balances in the adapter
const adapterWethBalanceBefore = parseEther('123');
await weth['mint(uint256)'](adapterWethBalanceBefore);
await weth['mint(address,uint256)'](deployer.address, adapterWethBalanceBefore);
await weth.transfer(paraswapWithdrawSwapAdapter.address, adapterWethBalanceBefore);
const adapterDaiBalanceBefore = parseEther('234');
await dai['mint(uint256)'](adapterDaiBalanceBefore);
Expand Down

0 comments on commit 3380e6f

Please sign in to comment.