From 9c138a02e14294db30455b21437ae1db7e19feff Mon Sep 17 00:00:00 2001 From: Mark Aiken Date: Thu, 16 Dec 2021 22:37:53 -0800 Subject: [PATCH] Fix Link Vault test, Address PR feedback round 4 --- contracts/polygon/connectors/qidao/main.sol | 4 --- test/polygon/qidao/qidao.test.ts | 38 +++++++++++++-------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/contracts/polygon/connectors/qidao/main.sol b/contracts/polygon/connectors/qidao/main.sol index e674da4c..d36be8c3 100644 --- a/contracts/polygon/connectors/qidao/main.sol +++ b/contracts/polygon/connectors/qidao/main.sol @@ -56,7 +56,6 @@ abstract contract QiDaoResolver is Events, Helpers { * @param vaultId The NFT ID which identifies the vault to be interacted with * @param amt The amount of the token to deposit. (For max: `uint256(-1)`) * @param getVaultId ID to retrieve vaultId. - * @param setVaultId ID stores the vault being interacted with. * @param getAmtId ID to retrieve amt. * @param setAmtId ID stores the amount of tokens withdrawn. */ @@ -99,7 +98,6 @@ abstract contract QiDaoResolver is Events, Helpers { * @param vaultId The NFT ID which identifies the vault to be interacted with * @param amt The amount of the token to deposit. (For max: `uint256(-1)`) * @param getVaultId ID to retrieve vaultId. - * @param setVaultId ID stores the vault being interacted with. * @param getAmtId ID to retrieve amt. * @param setAmtId ID stores the amount of tokens withdrawn. */ @@ -143,7 +141,6 @@ abstract contract QiDaoResolver is Events, Helpers { * @param vaultId The NFT ID which identifies the vault to be interacted with * @param amt The amount of the token to deposit. (For max: `uint256(-1)`) * @param getVaultId ID to retrieve vaultId. - * @param setVaultId ID stores the vault being interacted with. * @param getAmtId ID to retrieve amt. * @param setAmtId ID stores the amount of tokens withdrawn. */ @@ -184,7 +181,6 @@ abstract contract QiDaoResolver is Events, Helpers { * @param vaultId The NFT ID which identifies the vault to be interacted with * @param amt The amount of the token to deposit. (For max: `uint256(-1)`) * @param getVaultId ID to retrieve vaultId. - * @param setVaultId ID stores the vault being interacted with. * @param getAmtId ID to retrieve amt. * @param setAmtId ID stores the amount of tokens withdrawn. */ diff --git a/test/polygon/qidao/qidao.test.ts b/test/polygon/qidao/qidao.test.ts index 3168d8fc..63ea7b5f 100644 --- a/test/polygon/qidao/qidao.test.ts +++ b/test/polygon/qidao/qidao.test.ts @@ -81,32 +81,32 @@ describe("QiDao", function() { it("should create a MATIC vault in QiDao and deposit MATIC into that vault", async function() { const amt = parseEther("5"); const brwAmt = parseEther("1"); - const setVaultId = "13571113"; + const vaultID = "13571113"; const spells = [ { connector: connectorName, method: "createVault", - args: [vaults.matic.address, setVaultId], + args: [vaults.matic.address, vaultID], }, { connector: connectorName, method: "deposit", - args: [tokens.matic.address, vaults.matic.address, 0, amt, setVaultId, 0, 0, 0], + args: [tokens.matic.address, vaults.matic.address, 0, amt, vaultID, 0, 0], }, { connector: connectorName, method: "borrow", - args: [vaults.matic.address, 0, brwAmt, setVaultId, 0, 0 , 0] + args: [vaults.matic.address, 0, brwAmt, vaultID, 0, 0] }, { connector: connectorName, method: "payback", - args: [vaults.matic.address, 0, brwAmt, setVaultId, 0, 0 , 0], + args: [vaults.matic.address, 0, brwAmt, vaultID, 0, 0], }, { connector: connectorName, method: "withdraw", - args: [tokens.matic.address, vaults.matic.address, 0, amt.mul(995).div(1000), setVaultId, 0, 0, 0], + args: [tokens.matic.address, vaults.matic.address, 0, amt.mul(995).div(1000), vaultID, 0, 0], }, ]; @@ -125,32 +125,40 @@ describe("QiDao", function() { it("should create a LINK vault in QiDao and deposit LINK into that vault", async function() { const amt = parseEther("50"); const brwAmt = parseEther("10"); - const setVaultId = "13571113"; + const VaultId = "13571113"; + + let linkToken = await ethers.getContractAt( + abis.basic.erc20, + tokens.link.address); + let linkBalanceBefore = await linkToken.balanceOf(dsaWallet0.address); + + expect(linkBalanceBefore).to.eq(ethers.utils.parseEther("100")); + const spells = [ { connector: connectorName, method: "createVault", - args: [vaults.link.address, setVaultId], + args: [vaults.link.address, VaultId], }, { connector: connectorName, method: "deposit", - args: [tokens.link.address, vaults.link.address, 0, amt, setVaultId, 0, 0, 0], + args: [tokens.link.address, vaults.link.address, 0, amt, VaultId, 0, 0], }, { connector: connectorName, method: "borrow", - args: [vaults.link.address, 0, brwAmt, setVaultId, 0, 0 , 0] + args: [vaults.link.address, 0, brwAmt, VaultId, 0, 0] }, { connector: connectorName, method: "payback", - args: [vaults.link.address, 0, brwAmt, setVaultId, 0, 0 , 0], + args: [vaults.link.address, 0, brwAmt, VaultId, 0, 0], }, { connector: connectorName, method: "withdraw", - args: [tokens.link.address, vaults.link.address, 0, amt.mul(995).div(1000), setVaultId, 0, 0, 0], + args: [tokens.link.address, vaults.link.address, 0, amt.mul(995).div(1000), VaultId, 0, 0], }, ]; @@ -160,9 +168,9 @@ describe("QiDao", function() { await tx.wait(); - expect(await ethers.provider.getBalance(dsaWallet0.address)).to.eq( - parseEther("9.975") - ); + let linkBalanceAfter = await linkToken.balanceOf(dsaWallet0.address); + expect(linkBalanceAfter).to.eq(ethers.utils.parseEther("99.75")); + }); }); });