From 4f5fb523be86a94b967be30c143af3ec646c1f45 Mon Sep 17 00:00:00 2001 From: pradyuman-verma Date: Wed, 15 Dec 2021 17:52:53 +0530 Subject: [PATCH] fixed quickswap tests --- test/polygon/quickswap/quickswap.test.ts | 116 ++++++++--------------- 1 file changed, 38 insertions(+), 78 deletions(-) diff --git a/test/polygon/quickswap/quickswap.test.ts b/test/polygon/quickswap/quickswap.test.ts index b831dfe5..5047fd61 100644 --- a/test/polygon/quickswap/quickswap.test.ts +++ b/test/polygon/quickswap/quickswap.test.ts @@ -16,8 +16,8 @@ import type { Signer, Contract } from "ethers"; const DAI_ADDR = "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063"; -describe("Quickswap", function() { - const connectorName = "Quickpswap-v1.1"; +describe("Quickswap", function () { + const connectorName = "Quickswap-v1"; let dsaWallet0: Contract; let masterSigner: Signer; @@ -28,83 +28,57 @@ describe("Quickswap", function() { const [wallet0, wallet1, wallet2, wallet3] = wallets; before(async () => { await hre.network.provider.request({ - method: "hardhat_reset", - params: [ - { - forking: { - // @ts-ignore - jsonRpcUrl: hre.config.networks.hardhat.forking.url, - blockNumber: 13005785, - }, - }, - ], + method: "hardhat_reset", + params: [ + { + forking: { + // @ts-ignore + jsonRpcUrl: hre.config.networks.hardhat.forking.url + // blockNumber: 13005785 + } + } + ] }); masterSigner = await getMasterSigner(); - instaConnectorsV2 = await ethers.getContractAt( - abis.core.connectorsV2, - addresses.core.connectorsV2 - ); + instaConnectorsV2 = await ethers.getContractAt(abis.core.connectorsV2, addresses.core.connectorsV2); connector = await deployAndEnableConnector({ connectorName, contractArtifact: ConnectV2Quickswap__factory, signer: masterSigner, - connectors: instaConnectorsV2, + connectors: instaConnectorsV2 }); console.log("Connector address", connector.address); }); - it("Should have contracts deployed.", async function() { + it("Should have contracts deployed.", async function () { expect(!!instaConnectorsV2.address).to.be.true; expect(!!connector.address).to.be.true; expect(!!(await masterSigner.getAddress())).to.be.true; }); - describe("DSA wallet setup", function() { - it("Should build DSA v2", async function() { + describe("DSA wallet setup", function () { + it("Should build DSA v2", async function () { dsaWallet0 = await buildDSAv2(wallet0.address); expect(!!dsaWallet0.address).to.be.true; }); - it("Deposit ETH & DAI into DSA wallet", async function() { + it("Deposit ETH & DAI into DSA wallet", async function () { await wallet0.sendTransaction({ to: dsaWallet0.address, - value: ethers.utils.parseEther("10"), + value: ethers.utils.parseEther("10") }); - expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte( - ethers.utils.parseEther("10") - ); + expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte(ethers.utils.parseEther("10")); - await addLiquidity( - "dai", - dsaWallet0.address, - ethers.utils.parseEther("100000") - ); - }); - - it("Deposit ETH & USDT into DSA wallet", async function() { - await wallet0.sendTransaction({ - to: dsaWallet0.address, - value: ethers.utils.parseEther("10"), - }); - expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.gte( - ethers.utils.parseEther("10") - ); - - await addLiquidity( - "usdt", - dsaWallet0.address, - ethers.utils.parseEther("100000") - ); + await addLiquidity("dai", dsaWallet0.address, ethers.utils.parseEther("10000")); }); }); - describe("Main", function() { - it("Should deposit successfully", async function() { - const ethAmount = ethers.utils.parseEther("100"); // 1 ETH - const daiUnitAmount = ethers.utils.parseUnits("4", 6); // 1 ETH - const usdtAmount = Number(ethers.utils.parseEther("400")) / Math.pow(10, 12); // 1 ETH - const ethAddress = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"; + describe("Main", function () { + it("Should deposit successfully", async function () { + const ethAmount = ethers.utils.parseEther("0.1"); // 1 ETH + const daiUnitAmount = ethers.utils.parseEther("1"); // 1 ETH + const ethAddress = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"; const getId = "0"; const setId = "0"; @@ -113,26 +87,16 @@ describe("Quickswap", function() { { connector: connectorName, method: "deposit", - args: [ - ethAddress, - DAI_ADDR, - ethAmount, - daiUnitAmount, - "500000000000000000", - getId, - setId, - ], - }, + args: [ethAddress, DAI_ADDR, ethAmount, daiUnitAmount, "500000000000000000", getId, setId] + } ]; - const tx = await dsaWallet0 - .connect(wallet0) - .cast(...encodeSpells(spells), wallet1.address); + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); let receipt = await tx.wait(); }).timeout(10000000000); - it("Should withdraw successfully", async function() { - const ethAmount = ethers.utils.parseEther("0.1"); // 1 ETH + it("Should withdraw successfully", async function () { + const ethAmount = ethers.utils.parseEther("0.001"); // 1 ETH const ethAddress = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"; const getId = "0"; @@ -142,17 +106,15 @@ describe("Quickswap", function() { { connector: connectorName, method: "withdraw", - args: [ethAddress, DAI_ADDR, ethAmount, 0, 0, getId, setIds], - }, + args: [ethAddress, DAI_ADDR, ethAmount, 0, 0, getId, setIds] + } ]; - const tx = await dsaWallet0 - .connect(wallet0) - .cast(...encodeSpells(spells), wallet1.address); + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); let receipt = await tx.wait(); }); - it("Should buy successfully", async function() { + it("Should buy successfully", async function () { const ethAmount = ethers.utils.parseEther("0.1"); // 1 ETH const daiUnitAmount = ethers.utils.parseEther("4000"); // 1 ETH const ethAddress = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"; @@ -164,13 +126,11 @@ describe("Quickswap", function() { { connector: connectorName, method: "buy", - args: [ethAddress, DAI_ADDR, ethAmount, daiUnitAmount, getId, setId], - }, + args: [ethAddress, DAI_ADDR, ethAmount, daiUnitAmount, getId, setId] + } ]; - const tx = await dsaWallet0 - .connect(wallet0) - .cast(...encodeSpells(spells), wallet1.address); + const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address); let receipt = await tx.wait(); }); });