From 9c92a9ece787116f586a54523a523f937ae52d6d Mon Sep 17 00:00:00 2001
From: Richa-iitr <richa@cs.iitr.ac.in>
Date: Tue, 31 May 2022 22:57:05 +0530
Subject: [PATCH] modify tests

---
 .../connectors/aave/v3-import/helpers.sol       |  2 +-
 test/polygon/aave/v3-import-test.ts             | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/contracts/polygon/connectors/aave/v3-import/helpers.sol b/contracts/polygon/connectors/aave/v3-import/helpers.sol
index 335f700e..15fb7e7d 100644
--- a/contracts/polygon/connectors/aave/v3-import/helpers.sol
+++ b/contracts/polygon/connectors/aave/v3-import/helpers.sol
@@ -263,10 +263,10 @@ contract AaveHelpers is Helper {
 			);
 
 			for (uint256 i = 0; i < _length; i++) {
+			_targets[i] = "BASIC-A";
 				if (amts[i] > 0) {
 					uint256 _amt = amts[i];
 					address _token = tokens[i];
-					_targets[i] = "BASIC-A";
 					_data[i] = abi.encodeWithSelector(
 						basicWithdraw,
 						_token,
diff --git a/test/polygon/aave/v3-import-test.ts b/test/polygon/aave/v3-import-test.ts
index 86c830a1..a5751275 100644
--- a/test/polygon/aave/v3-import-test.ts
+++ b/test/polygon/aave/v3-import-test.ts
@@ -220,6 +220,7 @@ describe("Import Aave v3 Position", function () {
   let dsaWallet0: any;
   let dsaWallet1: any;
   let dsaWallet2: any;
+  let walletB: any;
   let masterSigner: Signer;
   let instaConnectorsV2: Contract;
   let connector: any;
@@ -298,10 +299,11 @@ describe("Import Aave v3 Position", function () {
     it("Should build DSA v2", async () => {
       dsaWallet0 = await buildDSAv2(wallet.address);
       expect(!!dsaWallet0.address).to.be.true;
-      dsaWallet2 = await buildDSAv2(wallet.address);
-      expect(!!dsaWallet2.address).to.be.true;
-      dsaWallet1 = await buildDSAv2(dsaWallet2.address);
+      dsaWallet1 = await buildDSAv2(wallet.address);
+      walletB = await ethers.getSigner(dsaWallet1.address);
       expect(!!dsaWallet1.address).to.be.true;
+      dsaWallet2 = await buildDSAv2(dsaWallet1.address);
+      expect(!!dsaWallet2.address).to.be.true;
     });
 
     it("Deposit ETH into DSA wallet", async function () {
@@ -325,7 +327,8 @@ describe("Import Aave v3 Position", function () {
     it("Should create DSA Aave v3 position of DAI(collateral) and USDC(debt)", async () => {
       await token.connect(signer).transfer(dsaWallet2.address, ethers.utils.parseEther("10"));
       console.log(await token.connect(signer).balanceOf(dsaWallet2.address));
-
+      console.log(dsaWallet1.address);
+      console.log(walletB.address);
       const spells = [
         //deposit DAI in aave
         {
@@ -340,7 +343,7 @@ describe("Import Aave v3 Position", function () {
           args: [USDC, parseUnits("3", 6), 2, 0, 0]
         }
       ];
-      const tx = await dsaWallet2.connect(wallet0).cast(...encodeSpells(spells), wallet.address);
+      const tx = await dsaWallet2.connect(walletB).cast(...encodeSpells(spells), walletB.address);
       const receipt = await tx.wait();
     });
 
@@ -410,7 +413,7 @@ describe("Import Aave v3 Position", function () {
         {
           connector: "AAVE-V3-IMPORT-X",
           method: "importAave",
-          args: [dsaWallet1.address, [[DAI], [USDC], false, [amountB.toFixed(0)]]]
+          args: [dsaWallet2.address, [[DAI], [USDC], false, [amountB.toFixed(0)]]]
         },
         {
           connector: "INSTAPOOL-C",
@@ -426,7 +429,7 @@ describe("Import Aave v3 Position", function () {
           args: [USDC, amount0.toString(), 5, encodeFlashcastData(flashSpells), "0x"]
         }
       ];
-      const tx = await dsaWallet2.connect(wallet0).cast(...encodeSpells(spells), wallet.address);
+      const tx = await dsaWallet1.connect(wallet0).cast(...encodeSpells(spells), wallet.address);
       const receipt = await tx.wait();
     });