changed test deposit id to 2 since initializer increments to 1

alicenet · Aug 22, 2022 · 1253835 · 1253835
1 parent 2ff1a32
commit 1253835
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/bridge/test/bToken/deposit.test.ts b/bridge/test/bToken/deposit.test.ts
@@ -21,7 +21,7 @@ describe("Testing BToken Deposit methods", async () => {
     [admin, user] = await ethers.getSigners();
     showState("Initial", await getState(fixture));
     ethIn = ethers.utils.parseEther(eth.toString());
-    bTokenDeposit = ethers.utils.parseUnits(bTokens.toString());
+    bTokenDeposit = ethers.utils.parseUnits(bTokens.toString(10));
   });
 
   it("Should fail querying for an invalid deposit ID", async () => {
@@ -67,7 +67,7 @@ describe("Testing BToken Deposit methods", async () => {
     );
     await expect(fixture.bToken.deposit(1, user.address, bTokenDeposit))
       .to.emit(fixture.bToken, "DepositReceived")
-      .withArgs(1 || 2, 1, user.address, bTokenDeposit);
+      .withArgs(2, 1, user.address, bTokenDeposit);
     expectedState = await getState(fixture);
     const tx = await fixture.bToken.deposit(1, user.address, bTokenDeposit);
     expectedState.Balances.bToken.admin -= bTokenDeposit.toBigInt();
@@ -94,7 +94,7 @@ describe("Testing BToken Deposit methods", async () => {
         )
     )
       .to.emit(fixture.bToken, "DepositReceived")
-      .withArgs(1 || 2, 1, user.address, bTokenDeposit);
+      .withArgs(2, 1, user.address, bTokenDeposit);
     expectedState = await getState(fixture);
     const tx = await fixture.factory
       .connect(admin)
@@ -120,7 +120,7 @@ describe("Testing BToken Deposit methods", async () => {
       })
     )
       .to.emit(fixture.bToken, "DepositReceived")
-      .withArgs(1 || 2, 1, user.address, bTokens);
+      .withArgs(2, 1, user.address, bTokens);
     expectedState = await getState(fixture);
     const tx = await fixture.bToken.mintDeposit(1, user.address, 0, {
       value: ethIn,
@@ -150,7 +150,7 @@ describe("Testing BToken Deposit methods", async () => {
           bTokenDeposit,
         ])
       );
-    const depositId = 1;
+    const depositId = 2;
     const deposit = await fixture.bToken.getDeposit(depositId);
     expect(deposit.value).to.be.equal(ethIn.toBigInt());
   });
@@ -165,7 +165,7 @@ describe("Testing BToken Deposit methods", async () => {
     );
     await expect(fixture.bToken.deposit(1, user.address, bTokenDeposit))
       .to.emit(fixture.bToken, "DepositReceived")
-      .withArgs(1 || 2, 1, user.address, bTokenDeposit);
+      .withArgs(2, 1, user.address, bTokenDeposit);
     expectedState = await getState(fixture);
     const tx = await fixture.bToken.deposit(1, user.address, bTokenDeposit);
     const [, tx2] = await callFunctionAndGetReturnValues(
@@ -197,7 +197,7 @@ describe("Testing BToken Deposit methods", async () => {
       }))
     )
       .to.emit(fixture.bToken, "DepositReceived")
-      .withArgs(1 || 2, 1, user.address, bTokens);
+      .withArgs(2, 1, user.address, bTokens);
     const tx = await fixture.bToken.mintDeposit(1, user.address, 0, {
       value: ethIn,
     });

diff --git a/bridge/test/setup.ts b/bridge/test/setup.ts
@@ -598,9 +598,16 @@ export const getFixture = async (
     "ATokenMinter",
     "ATokenMinter"
   )) as ATokenMinter;
-  const mintToFactory = aTokenMinter.interface.encodeFunctionData("mint", [factory.address, ethers.utils.parseEther("100000000")])
-  const txResponse = await factory.callAny(aTokenMinter.address, 0, mintToFactory)
-  await txResponse.wait()
+  const mintToFactory = aTokenMinter.interface.encodeFunctionData("mint", [
+    factory.address,
+    ethers.utils.parseEther("100000000"),
+  ]);
+  const txResponse = await factory.callAny(
+    aTokenMinter.address,
+    0,
+    mintToFactory
+  );
+  await txResponse.wait();
   const aTokenBurner = (await deployUpgradeableWithFactory(
     factory,
     "ATokenBurner",