🧪 Fix few failing tests"

Author: nazarhussain

package.json

@@ -44,6 +44,7 @@
     "packages/*/package.json": "node ./scripts/check-truffle-namespace-dependency-versions.js"
   },
   "resolutions": {
-    "web3-core": "^4.0.0-alpha.0"
+    "web3-core": "^4.0.0-alpha.0",
+    "web3-net": "4.0.0-alpha.0"
   }
 }

packages/contract-tests/test/abiV2.js

@@ -35,10 +35,10 @@ describe("ABIEncoderV2", function () {
       addUserReceipt = receipt;
     });
 
-    it.only("should allow structs as transaction arguments", async function () {
+    it("should allow structs as transaction arguments", async function () {
       assert.strictEqual(
         addUserReceipt.status,
-        true,
+        BigInt(1),
         "addUser transaction should have succeeded."
       );
     });
@@ -64,8 +64,9 @@ describe("ABIEncoderV2", function () {
       );
     });
 
-    it("should be capable of returning structs from calls", async function () {
+    it.only("should be capable of returning structs from calls", async function () {
       const returnedUser = await userDirectory.user(user.addr);
+      console.log(returnedUser);
 
       // can't just do assert.deepStrictEqual(returnedUser, user) because
       // the decoded struct is actually a tuple, and to emulate that it's

packages/contract/lib/contract/index.js

@@ -44,7 +44,7 @@ if (typeof Web3 === "object" && Object.keys(Web3).length === 0) {
           var isConstant =
             ["pure", "view"].includes(item.stateMutability) || item.constant; // new form // deprecated case
 
-          var signature = webUtils._jsonInterfaceMethodToString(item);
+          var signature = webUtils.jsonInterfaceMethodToString(item);
 
           var method = function (constant, web3Method) {
             var fn;

packages/contract/lib/execute.js

@@ -43,7 +43,6 @@ const execute = {
             const defaultGas = utils.bigNumberify(Math.floor(blockLimit / 2));
             accept(defaultGas.toHexString());
           } else {
-            console.log({ gas, blockLimit });
             const limit = utils.bigNumberify(blockLimit);
             // if we did get a numerical gas estimate from interfaceAdapter, we
             // multiply that estimate by the gasMultiplier to help ensure we
@@ -59,7 +58,6 @@ const execute = {
           }
         })
         .catch(error => {
-          console.log({ error });
           //HACK: Frankenstein together an error in a destructive fashion!!
           debug("error: %O", error);
           const reason = Reason._extract({ error }, web3);
@@ -202,7 +200,6 @@ const execute = {
 
     return function () {
       const promiEvent = new PromiEvent(false, constructor.debugger);
-
       execute
         .prepareCall(constructor, methodABI, arguments)
         .then(async ({ args, params, network }) => {
@@ -301,10 +298,8 @@ const execute = {
           });
 
           deferred = execute.sendTransaction(web3, params, promiEvent, context); //the crazy things we do for stacktracing...
-          console.log({ deferred });
           try {
             const receipt = await deferred;
-            console.log({ receipt });
             if (receipt.status !== undefined && !receipt.status) {
               const reason = await Reason.get(params, web3);
 

packages/contract/lib/handlers.js

@@ -62,7 +62,7 @@ const handlers = {
   error: function (context, error) {
     if (!handlers.ignoreTimeoutError(context, error)) {
       context.promiEvent.emit("error", error);
-      this.removeListener("error", handlers.error);
+      this.off("error", handlers.error);
     }
   },
 
@@ -73,18 +73,17 @@ const handlers = {
    * @param  {String} hash      transaction hash
    */
   hash: function (context, hash) {
-    console.log("%%%%% transactionHash", hash);
     context.transactionHash = hash;
     context.promiEvent.eventEmitter.emit("transactionHash", hash);
-    this.removeListener("transactionHash", handlers.hash);
+    this.off("transactionHash", handlers.hash);
   },
 
   confirmation: function (context, number, receipt) {
     context.promiEvent.eventEmitter.emit("confirmation", number, receipt);
 
     // Per web3: initial confirmation index is 0
     if (number === handlers.maxConfirmations + 1) {
-      this.removeListener("confirmation", handlers.confirmation);
+      this.off("confirmation", handlers.confirmation);
     }
   },
 
@@ -95,7 +94,6 @@ const handlers = {
    * @param  {Object} receipt   transaction receipt
    */
   receipt: async function (context, receipt) {
-    console.log("%%%%% receipt", receipt);
     // keep around the raw (not decoded) logs in the raw logs field as a
     // stopgap until we can get the ABI for all events, not just the current
     // contract
@@ -146,8 +144,8 @@ const handlers = {
 
     //HACK: adding this conditional for when the handler is invoked
     //manually during stacktracing
-    if (this.removeListener) {
-      this.removeListener("receipt", handlers.receipt);
+    if (this.off) {
+      this.off("receipt", handlers.receipt);
     }
   }
 };

packages/contract/lib/utils/index.js

@@ -1,5 +1,5 @@
 const debug = require("debug")("contract:utils");
-const web3Utils = require("web3-utils");
+const BN = require("bn.js");
 const { bigNumberify } = require("ethers/utils/bignumber");
 const abi = require("web3-eth-abi");
 const BlockchainUtils = require("@truffle/blockchain-utils");
@@ -30,11 +30,7 @@ const Utils = {
   is_big_number(val) {
     if (typeof val !== "object") return false;
 
-    //NOTE: For some reason, contrary to the docs,
-    //web3Utils.isBigNumber returns true not only for
-    //bignumber.js BigNumbers, but also for ethers BigNumbers,
-    //even though these are totally different things.
-    return web3Utils.isBN(val) || web3Utils.isBigNumber(val);
+    return BN.isBN(val);
   },
 
   isTxParams(val) {
@@ -209,12 +205,13 @@ const Utils = {
         const ethersBN = bigNumberify(stringValue);
         converted.push(ethersBN);
       }
-      if (BigInt.isBigInt(item)) {
+      if (typeof item === "bigint") {
         converted.push(bigNumberify(item.toString()));
       } else {
         converted.push(item);
       }
     });
+
     return converted;
   },
 

packages/dashboard-message-bus-e2e-test/test/DashboardServer.test.ts

@@ -95,7 +95,7 @@ describe("DashboardServer", () => {
       const response = await signer.sendTransaction({
         from: accounts[0],
         to: accounts[1],
-        value: utils.parseEther("0.1")
+        value: utils.parseEther("0.1").toHexString()
       });
 
       expect(response).toHaveProperty("hash");

yarn.lock

@@ -29546,6 +29546,7 @@ web3-eth@^4.0.0-alpha.1:
     web3-utils "^4.0.0-alpha.1"
     web3-validator "^0.1.0-alpha.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 [email protected]:
@@ -29573,6 +29574,9 @@ [email protected]:
 >>>>>>> 29671cc03 (:art: Fix the issues raised after merging base branch)
 
 web3-net@^4.0.0-alpha.0:
+=======
+[email protected], [email protected], web3-net@^4.0.0-alpha.0:
+>>>>>>> fa87809d7 (:test_tube: Fix few failing tests")
   version "4.0.0-alpha.0"
   resolved "http://localhost:4873/web3-net/-/web3-net-4.0.0-alpha.0.tgz#c7c939f9ad4be0b1f854640d5c9e8469c88af4dd"
   integrity sha512-K3+Wp8ZYOJeKZ4THcBzCPnCKVdKES6IQYLQz6nBEqJBt+gjax407dfl8B6uMLFL3PSxLg1pS7TwSAAevUryRLw==