Replace expect with assert. Fix wei leading zeros

mantlenetworkio · Jul 27, 2022 · e35cf6e · e35cf6e
1 parent 9755600
commit e35cf6e
Show file tree

Hide file tree

Showing 9 changed files with 142 additions and 90 deletions.
diff --git a/test/arbitrum/managing-deposits.e2e.test.ts b/test/arbitrum/managing-deposits.e2e.test.ts
@@ -1,3 +1,11 @@
+import {
+  getL2Network,
+  L1TransactionReceipt,
+  L1ToL2MessageStatus,
+} from "@arbitrum/sdk";
+import { assert } from "chai";
+import { ContractReceipt } from "ethers";
+
 import {
   ERC20Bridged__factory,
   ERC20Mintable__factory,
@@ -9,22 +17,15 @@ import {
   Agent__factory,
   TokenManager__factory,
 } from "../../typechain";
-import { wei } from "../../utils/wei";
-import { expect } from "chai";
-import network from "../../utils/network";
-import env from "../../utils/env";
-import { scenario } from "../../utils/testing";
 import {
   E2E_TEST_CONTRACTS_ARBITRUM as E2E_TEST_CONTRACTS,
   createArbitrumVoting as createDAOVoting,
   sleep,
 } from "../../utils/testing/e2e";
-import { ContractReceipt } from "ethers";
-import {
-  getL2Network,
-  L1TransactionReceipt,
-  L1ToL2MessageStatus,
-} from "@arbitrum/sdk";
+import { wei } from "../../utils/wei";
+import network from "../../utils/network";
+import env from "../../utils/env";
+import { scenario } from "../../utils/testing";
 
 const DEPOSIT_ENABLER_ROLE =
   "0x4b43b36766bde12c5e9cbbc37d15f8d1f769f08f54720ab370faeb4ce893753a";
@@ -39,17 +40,17 @@ scenario(
   ctxFactory
 )
   .step("LDO Holder has enought ETH", async ({ l1LDOHolder, gasAmount }) => {
-    expect(await l1LDOHolder.getBalance()).to.gte(gasAmount);
+    assert.gte(await l1LDOHolder.getBalance(), gasAmount);
   })
 
   .step("L2 Tester has enought ETH", async ({ l2Tester, gasAmount }) => {
-    expect(await l2Tester.getBalance()).to.gte(gasAmount);
+    assert.gte(await l2Tester.getBalance(), gasAmount);
   })
 
   .step(
     "L2 Agent has enought ETH",
     async ({ l1Provider, agent, gasAmount }) => {
-      expect(await l1Provider.getBalance(agent.address)).to.gte(gasAmount);
+      assert.gte(await l1Provider.getBalance(agent.address), gasAmount);
     }
   )
 
@@ -136,7 +137,8 @@ scenario(
   })
 
   .step("Checking deposits state", async ({ l2ERC20TokenGateway }) => {
-    expect(await l2ERC20TokenGateway.isDepositsEnabled()).to.eq(
+    assert.equal(
+      await l2ERC20TokenGateway.isDepositsEnabled(),
       !l2DepositsInitialState
     );
   })
@@ -160,7 +162,6 @@ async function ctxFactory() {
   // replace gateway router addresses with test
   l2Network.tokenBridge.l1GatewayRouter = E2E_TEST_CONTRACTS.l1.l1GatewayRouter;
   l2Network.tokenBridge.l2GatewayRouter = E2E_TEST_CONTRACTS.l2.l2GatewayRouter;
-
   return {
     gasAmount: wei`0.1 ether`,
     depositAmount: wei`0.025 ether`,

diff --git a/test/arbitrum/managing-executor.e2e.test.ts b/test/arbitrum/managing-executor.e2e.test.ts
@@ -1,4 +1,13 @@
-import { expect } from "chai";
+import {
+  Erc20Bridger,
+  getL2Network,
+  L1TransactionReceipt,
+  L1ToL2MessageStatus,
+} from "@arbitrum/sdk";
+import { assert } from "chai";
+import { ContractReceipt } from "ethers";
+import { L2ERC20Gateway__factory } from "arb-ts";
+
 import {
   ERC20Bridged__factory,
   ERC20Mintable__factory,
@@ -9,42 +18,33 @@ import {
   GovBridgeExecutor__factory,
   Inbox__factory,
 } from "../../typechain";
-import env from "../../utils/env";
-import network from "../../utils/network";
-import { wei } from "../../utils/wei";
-import {
-  Erc20Bridger,
-  getL2Network,
-  L1TransactionReceipt,
-  L1ToL2MessageStatus,
-} from "@arbitrum/sdk";
-import { scenario } from "../../utils/testing";
-import { L2ERC20Gateway__factory } from "arb-ts";
-import { ContractReceipt } from "ethers";
-
 import {
   E2E_TEST_CONTRACTS_ARBITRUM as E2E_TEST_CONTRACTS,
   createArbitrumVoting as createDAOVoting,
   sleep,
 } from "../../utils/testing/e2e";
+import env from "../../utils/env";
+import network from "../../utils/network";
+import { wei } from "../../utils/wei";
+import { scenario } from "../../utils/testing";
 
 let oldGuardian: string;
 let newGuardian: string;
 let ticketTx: ContractReceipt;
 
 scenario("Arbitrum :: Update guardian", ctxFactory)
   .step("LDO Holder has enought ETH", async ({ l1LDOHolder, gasAmount }) => {
-    expect(await l1LDOHolder.getBalance()).to.gte(gasAmount);
+    assert.gte(await l1LDOHolder.getBalance(), gasAmount);
   })
 
   .step("L2 Tester has enought ETH", async ({ l2Tester, gasAmount }) => {
-    expect(await l2Tester.getBalance()).to.gte(gasAmount);
+    assert.gte(await l2Tester.getBalance(), gasAmount);
   })
 
   .step(
     "L2 Agent has enought ETH",
     async ({ l1Provider, agent, gasAmount }) => {
-      expect(await l1Provider.getBalance(agent.address)).to.gte(gasAmount);
+      assert.gte(await l1Provider.getBalance(agent.address), gasAmount);
     }
   )
 
@@ -123,7 +123,7 @@ scenario("Arbitrum :: Update guardian", ctxFactory)
   })
 
   .step("Checking guardian", async ({ govBridgeExecutor }) => {
-    expect(await govBridgeExecutor.getGuardian()).to.eq(newGuardian);
+    assert.equal(await govBridgeExecutor.getGuardian(), newGuardian);
   })
   .run();
 

diff --git a/test/arbitrum/managing-proxy.e2e.test.ts b/test/arbitrum/managing-proxy.e2e.test.ts
@@ -1,3 +1,11 @@
+import {
+  getL2Network,
+  L1TransactionReceipt,
+  L1ToL2MessageStatus,
+} from "@arbitrum/sdk";
+import { assert } from "chai";
+import { ContractReceipt } from "ethers";
+
 import {
   ERC20Bridged__factory,
   ERC20Mintable__factory,
@@ -9,52 +17,45 @@ import {
   TokenManager__factory,
   OssifiableProxy__factory,
 } from "../../typechain";
-import { wei } from "../../utils/wei";
-import { expect } from "chai";
-import network from "../../utils/network";
-import env from "../../utils/env";
-import { scenario } from "../../utils/testing";
 import {
   E2E_TEST_CONTRACTS_ARBITRUM as E2E_TEST_CONTRACTS,
   createArbitrumVoting as createDAOVoting,
   sleep,
 } from "../../utils/testing/e2e";
-import { ContractReceipt } from "ethers";
-import {
-  getL2Network,
-  L1TransactionReceipt,
-  L1ToL2MessageStatus,
-} from "@arbitrum/sdk";
+import env from "../../utils/env";
+import { wei } from "../../utils/wei";
+import network from "../../utils/network";
+import { scenario } from "../../utils/testing";
 
 let upgradeMessageResponse: ContractReceipt;
 let ossifyMessageResponse: ContractReceipt;
 
 scenario("Arbitrum :: AAVE governance crosschain bridge", ctxFactory)
   .step("LDO Holder has enought ETH", async ({ l1LDOHolder, gasAmount }) => {
-    expect(await l1LDOHolder.getBalance()).to.gte(gasAmount);
+    assert.gte(await l1LDOHolder.getBalance(), gasAmount);
   })
 
   .step("L2 Tester has enought ETH", async ({ l2Tester, gasAmount }) => {
-    expect(await l2Tester.getBalance()).to.gte(gasAmount);
+    assert.gte(await l2Tester.getBalance(), gasAmount);
   })
 
   .step(
     "L2 Agent has enought ETH",
     async ({ l1Provider, agent, gasAmount }) => {
-      expect(await l1Provider.getBalance(agent.address)).to.gte(gasAmount);
+      assert.gte(await l1Provider.getBalance(agent.address), gasAmount);
     }
   )
   .step("Check OssifiableProxy deployed correct", async (ctx) => {
     const { proxyToOssify } = ctx;
     const admin = await proxyToOssify.proxy__getAdmin();
 
-    expect(admin).equals(E2E_TEST_CONTRACTS.l2.govBridgeExecutor);
+    assert.equal(admin, E2E_TEST_CONTRACTS.l2.govBridgeExecutor);
   })
 
   .step("Proxy upgrade: send crosschain message", async (ctx) => {
     const implBefore = await await ctx.proxyToOssify.proxy__getImplementation();
 
-    expect(implBefore).equals(ctx.l2ERC20TokenGateway.address);
+    assert.equal(implBefore, ctx.l2ERC20TokenGateway.address);
     const executorCalldata =
       await ctx.govBridgeExecutor.interface.encodeFunctionData("queue", [
         [ctx.proxyToOssify.address],
@@ -128,12 +129,12 @@ scenario("Arbitrum :: AAVE governance crosschain bridge", ctxFactory)
 
   .step("Proxy upgrade: check state", async ({ proxyToOssify, l2Token }) => {
     const implAfter = await await proxyToOssify.proxy__getImplementation();
-    expect(implAfter).equals(l2Token.address);
+    assert.equal(implAfter, l2Token.address);
   })
 
   .step("Proxy ossify: send crosschain message", async (ctx) => {
     const isOssifiedBefore = await ctx.proxyToOssify.proxy__getIsOssified();
-    expect(isOssifiedBefore).is.false;
+    assert.isFalse(isOssifiedBefore);
 
     const executorCalldata =
       await ctx.govBridgeExecutor.interface.encodeFunctionData("queue", [
@@ -154,7 +155,7 @@ scenario("Arbitrum :: AAVE governance crosschain bridge", ctxFactory)
     const voteTx = await voting.vote(targetVote, true, true);
     await voteTx.wait();
 
-    while ((await voting.getVotePhase(targetVote)) != 2) {}
+    while ((await voting.getVotePhase(targetVote)) !== 2);
 
     const enactTx = await voting.executeVote(targetVote);
     ossifyMessageResponse = await enactTx.wait();
@@ -186,7 +187,7 @@ scenario("Arbitrum :: AAVE governance crosschain bridge", ctxFactory)
   .step("Proxy upgrade: check state", async ({ proxyToOssify, l2Token }) => {
     const isOssifiedAfter = await proxyToOssify.proxy__getIsOssified();
 
-    expect(isOssifiedAfter).is.true;
+    assert.isTrue(isOssifiedAfter);
   })
 
   .run();

diff --git a/test/optimism/managing-deposits.e2e.test.ts b/test/optimism/managing-deposits.e2e.test.ts
@@ -1,3 +1,7 @@
+import { assert } from "chai";
+import { TransactionResponse } from "@ethersproject/providers";
+import { CrossChainMessenger, MessageStatus } from "@eth-optimism/sdk";
+
 import {
   ERC20Bridged__factory,
   ERC20Mintable__factory,
@@ -9,18 +13,15 @@ import {
   TokenManager__factory,
   CrossDomainMessanger__factory,
 } from "../../typechain";
-import { wei } from "../../utils/wei";
-import { CrossChainMessenger, MessageStatus } from "@eth-optimism/sdk";
-import { expect } from "chai";
-import { TransactionResponse } from "@ethersproject/providers";
-import network from "../../utils/network";
-import env from "../../utils/env";
-import { scenario } from "../../utils/testing";
 import {
   E2E_TEST_CONTRACTS_OPTIMISM as E2E_TEST_CONTRACTS,
   createOptimismVoting as createDAOVoting,
   sleep,
 } from "../../utils/testing/e2e";
+import env from "../../utils/env";
+import { wei } from "../../utils/wei";
+import network from "../../utils/network";
+import { scenario } from "../../utils/testing";
 
 const DEPOSIT_ENABLER_ROLE =
   "0x4b43b36766bde12c5e9cbbc37d15f8d1f769f08f54720ab370faeb4ce893753a";
@@ -36,7 +37,7 @@ scenario(
   ctxFactory
 )
   .step("LDO Holder has enought ETH", async ({ l1LDOHolder, gasAmount }) => {
-    expect(await l1LDOHolder.getBalance()).to.gte(gasAmount);
+    assert.gte(await l1LDOHolder.getBalance(), gasAmount);
   })
 
   .step("Checking deposits status", async ({ l2ERC20TokenBridge }) => {
@@ -79,7 +80,7 @@ scenario(
     const voteTx = await voting.vote(targetVote, true, true);
     await voteTx.wait();
 
-    while ((await voting.getVotePhase(targetVote)) != 2) {
+    while ((await voting.getVotePhase(targetVote)) !== 2) {
       await sleep(5000);
     }
 
@@ -123,7 +124,8 @@ scenario(
   })
 
   .step("Checking deposits state", async ({ l2ERC20TokenBridge }) => {
-    expect(await l2ERC20TokenBridge.isDepositsEnabled()).to.eq(
+    assert.equal(
+      await l2ERC20TokenBridge.isDepositsEnabled(),
       !l2DepositsInitialState
     );
   })

diff --git a/test/optimism/managing-executor.e2e.test.ts b/test/optimism/managing-executor.e2e.test.ts
@@ -1,3 +1,7 @@
+import { assert } from "chai";
+import { TransactionResponse } from "@ethersproject/providers";
+import { CrossChainMessenger, MessageStatus } from "@eth-optimism/sdk";
+
 import {
   ERC20Bridged__factory,
   ERC20Mintable__factory,
@@ -9,26 +13,23 @@ import {
   TokenManager__factory,
   CrossDomainMessanger__factory,
 } from "../../typechain";
-import { wei } from "../../utils/wei";
-import { CrossChainMessenger, MessageStatus } from "@eth-optimism/sdk";
-import { expect } from "chai";
-import { TransactionResponse } from "@ethersproject/providers";
-import network from "../../utils/network";
-import env from "../../utils/env";
-import { scenario } from "../../utils/testing";
 import {
   E2E_TEST_CONTRACTS_OPTIMISM as E2E_TEST_CONTRACTS,
   createOptimismVoting as createDAOVoting,
   sleep,
 } from "../../utils/testing/e2e";
+import env from "../../utils/env";
+import { wei } from "../../utils/wei";
+import network from "../../utils/network";
+import { scenario } from "../../utils/testing";
 
 let messageTx: TransactionResponse;
 let oldGuardian: string;
 let newGuardian: string;
 
 scenario("Optimism :: AAVE governance crosschain bridge management", ctxFactory)
   .step("LDO Holder has enought ETH", async ({ l1LDOHolder, gasAmount }) => {
-    expect(await l1LDOHolder.getBalance()).to.gte(gasAmount);
+    assert.gte(await l1LDOHolder.getBalance(), gasAmount);
   })
 
   .step(`Starting DAO vote: Update guardian`, async (ctx) => {
@@ -107,7 +108,7 @@ scenario("Optimism :: AAVE governance crosschain bridge management", ctxFactory)
   })
 
   .step("Checking guardian", async ({ govBridgeExecutor }) => {
-    expect(await govBridgeExecutor.getGuardian()).to.eq(newGuardian);
+    assert.equal(await govBridgeExecutor.getGuardian(), newGuardian);
   })
 
   .run();