Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Link Vault test, Address PR feedback round 4

Browse Source
This commit is contained in:
Mark Aiken 2021-12-16 22:37:53 -08:00
parent 769209f49f
commit 9c138a02e1
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/polygon/connectors/qidao/main.sol
View File

@ -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.
*/

38
test/polygon/qidao/qidao.test.ts
View File

@ -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"));
});
});
});