Add BigNumber assertions

test/integration/targets/web3-1.0.0/ContractWithOverloads.spec.web3.ts

@@ -1,4 +1,4 @@
-import { deployContract, accounts } from "./web3";
+import { deployContract, accounts, isBigNumber } from "./web3";
 import { ContractWithOverloads } from "./types/web3-contracts/ContractWithOverloads";
 
 import { expect } from "chai";
@@ -7,8 +7,8 @@ describe("ContractWithOverloads", () => {
   it("should work", async () => {
     const contract = await deployContract<ContractWithOverloads>("ContractWithOverloads");
 
-    expect((await contract.methods.counter().call({ from: accounts[0] })).toString()).to.be.deep.eq(
-      "0",
-    );
+    const res = await contract.methods.counter().call({ from: accounts[0] });
+    expect(isBigNumber(res)).to.be.true;
+    expect(res.toString()).to.be.eq("0");
   });
 });

test/integration/targets/web3-1.0.0/DumbContract.spec.web3.ts

@@ -1,4 +1,4 @@
-import { deployContract, accounts } from "./web3";
+import { deployContract, accounts, isBigNumber } from "./web3";
 import { DumbContract } from "./types/web3-contracts/DumbContract";
 
 import { expect } from "chai";
@@ -8,6 +8,8 @@ describe("DumbContract", () => {
     const contract: DumbContract = await deployContract<DumbContract>("DumbContract");
 
     const res = await contract.methods.returnAll().call({ from: accounts[0] });
+    expect(isBigNumber(res[0])).to.be.true;
+    expect(isBigNumber(res[1])).to.be.true;
     expect(res[0].toString()).to.be.eq("0");
     expect(res[1].toString()).to.be.eq("5");
   });
@@ -22,16 +24,26 @@ describe("DumbContract", () => {
     const contract = await deployContract<DumbContract>("DumbContract");
 
     await contract.methods.countup(2).send({ from: accounts[0] });
-    expect((await contract.methods.counter().call()).toString()).to.be.eq("2");
+    const withNumber = await contract.methods.counter().call();
+    expect(isBigNumber(withNumber)).to.be.true;
+    expect(withNumber.toString()).to.be.eq("2");
+
     await contract.methods.countup("2").send({ from: accounts[0] });
-    expect((await contract.methods.counter().call()).toString()).to.be.eq("4");
+    const withString = await contract.methods.counter().call();
+    expect(isBigNumber(withString)).to.be.true;
+    expect(withString.toString()).to.be.eq("4");
   });
 
   it("should allow to pass signed values in multiple ways", async () => {
     const contract = await deployContract<DumbContract>("DumbContract");
 
-    expect((await contract.methods.returnSigned(2).call()).toString()).to.be.eq("2");
-    expect((await contract.methods.returnSigned("2").call()).toString()).to.be.eq("2");
+    const withNumber = await contract.methods.returnSigned(2).call();
+    expect(isBigNumber(withNumber)).to.be.true;
+    expect(withNumber.toString()).to.be.eq("2");
+
+    const withString = await contract.methods.returnSigned("2").call();
+    expect(isBigNumber(withString)).to.be.true;
+    expect(withString.toString()).to.be.eq("2");
   });
 
   it("should allow to pass address values in multiple ways", async () => {
@@ -65,6 +77,8 @@ describe("DumbContract", () => {
 
     const res = await contract.methods.callWithArray2(["1", 2]).call();
     expect(res.length).to.be.eq(2);
+    expect(isBigNumber(res[0])).to.be.true;
+    expect(isBigNumber(res[1])).to.be.true;
     expect(res[0].toString()).to.be.eq("1");
     expect(res[1].toString()).to.be.eq("2");
   });

test/integration/targets/web3-1.0.0/web3.ts

@@ -38,3 +38,9 @@ export async function deployContract<T>(contractName: string): Promise<T> {
     gas: GAS_LIMIT_STANDARD,
   }) as any)) as T;
 }
+
+export function isBigNumber(object: any): boolean {
+  // Cribbed from web3-utils until BNs/BigNumbers are resolved in web3
+  // https://github.com/ethereum/web3.js/issues/2468
+  return object && object.constructor && object.constructor.name === "BigNumber";
+}