Merge pull request NomicFoundation#1106 from nomiclabs/ci-false-negat…

…ives Reduce CI false negatives
StillFantastic · Dec 28, 2020 · 547c750 · 547c750
2 parents 857d715 + 79cda05
commit 547c750
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 9 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -73,7 +73,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: 10
+          node-version: 12
       - uses: actions/checkout@v2
       - name: Install
         run: yarn --frozen-lockfile

diff --git a/packages/hardhat-core/src/internal/hardhat-network/jsonrpc/client.ts b/packages/hardhat-core/src/internal/hardhat-network/jsonrpc/client.ts
@@ -322,11 +322,16 @@ export class JsonRpcClient {
   }
 
   private _shouldRetry(isRetryCall: boolean, err: any) {
+    const isRetriableError =
+      err.message.includes("header not found") ||
+      err.message.includes("connect ETIMEDOUT");
+
+    const isServiceUrl =
+      this._httpProvider.url.includes("infura") ||
+      this._httpProvider.url.includes("alchemyapi");
+
     return (
-      !isRetryCall &&
-      this._httpProvider.url.includes("infura") &&
-      err instanceof Error &&
-      err.message.includes("header not found")
+      !isRetryCall && isServiceUrl && err instanceof Error && isRetriableError
     );
   }
 

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth.ts
@@ -60,6 +60,10 @@ const PRECOMPILES_COUNT = 8;
 
 describe("Eth module", function () {
   PROVIDERS.forEach(({ name, useProvider, isFork, chainId }) => {
+    if (isFork) {
+      this.timeout(50000);
+    }
+
     describe(`${name} provider`, function () {
       setCWD();
       useProvider();

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/evm.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/evm.ts
@@ -45,7 +45,11 @@ async function deployContract(
 }
 
 describe("Evm module", function () {
-  PROVIDERS.forEach(({ name, useProvider }) => {
+  PROVIDERS.forEach(({ name, useProvider, isFork }) => {
+    if (isFork) {
+      this.timeout(50000);
+    }
+
     describe(`${name} provider`, function () {
       setCWD();
       useProvider();

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/hardhat.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/hardhat.ts
@@ -10,6 +10,10 @@ import { PROVIDERS } from "../../helpers/providers";
 
 describe("Hardhat module", function () {
   PROVIDERS.forEach(({ name, useProvider, isFork }) => {
+    if (isFork) {
+      this.timeout(50000);
+    }
+
     describe(`${name} provider`, function () {
       setCWD();
       useProvider();
@@ -149,7 +153,7 @@ describe("Hardhat module", function () {
 
             // This condition is rather loose as Infura can sometimes return
             // a smaller block number on subsequent eth_blockNumber call
-            assert.closeTo(await getLatestBlockNumber(), initialBlock, 2);
+            assert.closeTo(await getLatestBlockNumber(), initialBlock, 4);
           });
 
           it("can reset the forked provider to a normal provider", async function () {

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/net.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/net.ts
@@ -5,7 +5,11 @@ import { setCWD } from "../../helpers/cwd";
 import { PROVIDERS } from "../../helpers/providers";
 
 describe("Net module", function () {
-  PROVIDERS.forEach(({ name, useProvider, networkId }) => {
+  PROVIDERS.forEach(({ name, useProvider, networkId, isFork }) => {
+    if (isFork) {
+      this.timeout(50000);
+    }
+
     describe(`Provider ${name}`, function () {
       setCWD();
       useProvider();

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/web3.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/web3.ts
@@ -6,7 +6,11 @@ import { setCWD } from "../../helpers/cwd";
 import { PROVIDERS } from "../../helpers/providers";
 
 describe("Web3 module", function () {
-  PROVIDERS.forEach(({ name, useProvider }) => {
+  PROVIDERS.forEach(({ name, useProvider, isFork }) => {
+    if (isFork) {
+      this.timeout(50000);
+    }
+
     describe(`Provider ${name}`, function () {
       setCWD();
       useProvider();