Merge pull request NomicFoundation#1974 from nomiclabs/fix-imports-to…

…-built-files Fix multiple imports to the build instead of src/
adeubank · Oct 21, 2021 · b9e6b92 · b9e6b92
2 parents 9a9d299 + d7a1d80
commit b9e6b92
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 44 deletions.
diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/blockTags.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/blockTags.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { zeroAddress } from "ethereumjs-util";
 
-import { RpcBlockOutput } from "../../../../../../internal/hardhat-network/provider/output";
+import { RpcBlockOutput } from "../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../utils/workaround-windows-ci-failures";
 import {
   assertInvalidArgumentsError,

diff --git a/...es/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/blockNumber.ts b/...es/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/blockNumber.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertQuantity } from "../../../../helpers/assertions";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/call.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/call.ts
@@ -5,8 +5,10 @@ import {
   numberToRpcQuantity,
   rpcDataToNumber,
   rpcQuantityToNumber,
-} from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { getCurrentTimestamp } from "../../../../../../../internal/hardhat-network/provider/utils/getCurrentTimestamp";
+  rpcDataToBN,
+  rpcQuantityToBN,
+} from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { getCurrentTimestamp } from "../../../../../../../src/internal/hardhat-network/provider/utils/getCurrentTimestamp";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertInvalidInputError } from "../../../../helpers/assertions";
 import {
@@ -26,10 +28,6 @@ import {
   sendTxToZeroAddress,
 } from "../../../../helpers/transactions";
 import { compileLiteral } from "../../../../stack-traces/compilation";
-import {
-  rpcDataToBN,
-  rpcQuantityToBN,
-} from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 
 describe("Eth module", function () {
   PROVIDERS.forEach(({ name, useProvider, isFork }) => {

diff --git a/...es/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/estimateGas.ts b/...es/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/estimateGas.ts
@@ -7,7 +7,10 @@ import {
   FeeMarketEIP1559Transaction,
   Transaction,
 } from "@ethereumjs/tx";
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
+import {
+  numberToRpcQuantity,
+  rpcQuantityToBN,
+} from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertInvalidInputError } from "../../../../helpers/assertions";
 import { EXAMPLE_CONTRACT } from "../../../../helpers/contracts";
@@ -20,7 +23,6 @@ import { retrieveForkBlockNumber } from "../../../../helpers/retrieveForkBlockNu
 import { deployContract } from "../../../../helpers/transactions";
 import { HardhatNode } from "../../../../../../../src/internal/hardhat-network/provider/node";
 import { RpcBlockOutput } from "../../../../../../../src/internal/hardhat-network/provider/output";
-import { rpcQuantityToBN } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 
 describe("Eth module", function () {
   PROVIDERS.forEach(({ name, useProvider, isFork }) => {

diff --git a/...hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getBlockByHash.ts b/...hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getBlockByHash.ts
@@ -1,10 +1,10 @@
 import { assert } from "chai";
 
-import { COINBASE_ADDRESS } from "../../../../../../../internal/hardhat-network/provider/node";
+import { COINBASE_ADDRESS } from "../../../../../../../src/internal/hardhat-network/provider/node";
 import {
   RpcBlockOutput,
   RpcTransactionOutput,
-} from "../../../../../../../internal/hardhat-network/provider/output";
+} from "../../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertQuantity } from "../../../../helpers/assertions";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/...rdhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getBlockByNumber.ts b/...rdhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getBlockByNumber.ts
@@ -5,12 +5,12 @@ import {
   numberToRpcQuantity,
   rpcQuantityToBN,
   rpcQuantityToNumber,
-} from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { COINBASE_ADDRESS } from "../../../../../../../internal/hardhat-network/provider/node";
+} from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { COINBASE_ADDRESS } from "../../../../../../../src/internal/hardhat-network/provider/node";
 import {
   RpcBlockOutput,
   RpcTransactionOutput,
-} from "../../../../../../../internal/hardhat-network/provider/output";
+} from "../../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertQuantity } from "../../../../helpers/assertions";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/...t/internal/hardhat-network/provider/modules/eth/methods/getBlockTransactionCountByHash.ts b/...t/internal/hardhat-network/provider/modules/eth/methods/getBlockTransactionCountByHash.ts
@@ -1,10 +1,10 @@
 import { assert } from "chai";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import {
   RpcBlockOutput,
   RpcTransactionOutput,
-} from "../../../../../../../internal/hardhat-network/provider/output";
+} from "../../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertQuantity } from "../../../../helpers/assertions";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/...internal/hardhat-network/provider/modules/eth/methods/getBlockTransactionCountByNumber.ts b/...internal/hardhat-network/provider/modules/eth/methods/getBlockTransactionCountByNumber.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertQuantity } from "../../../../helpers/assertions";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getCode.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getCode.ts
@@ -1,8 +1,8 @@
 import { assert } from "chai";
 import { zeroAddress } from "ethereumjs-util";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { randomAddress } from "../../../../../../../internal/hardhat-network/provider/fork/random";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { randomAddress } from "../../../../../../../src/internal/hardhat-network/provider/fork/random";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { assertInvalidInputError } from "../../../../helpers/assertions";
 import { EXAMPLE_CONTRACT } from "../../../../helpers/contracts";

diff --git a/.../hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getFilterLogs.ts b/.../hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getFilterLogs.ts
@@ -3,7 +3,7 @@ import { assert } from "chai";
 import {
   numberToRpcQuantity,
   rpcQuantityToNumber,
-} from "../../../../../../../internal/core/jsonrpc/types/base-types";
+} from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { EXAMPLE_CONTRACT } from "../../../../helpers/contracts";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getLogs.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getLogs.ts
@@ -3,7 +3,7 @@ import { assert } from "chai";
 import {
   numberToRpcQuantity,
   rpcQuantityToNumber,
-} from "../../../../../../../internal/core/jsonrpc/types/base-types";
+} from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { EXAMPLE_CONTRACT } from "../../../../helpers/contracts";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/...s/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getStorageAt.ts b/...s/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/getStorageAt.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { EXAMPLE_CONTRACT } from "../../../../helpers/contracts";
 import { setCWD } from "../../../../helpers/cwd";

diff --git a/...nternal/hardhat-network/provider/modules/eth/methods/getTransactionByBlockHashAndIndex.ts b/...nternal/hardhat-network/provider/modules/eth/methods/getTransactionByBlockHashAndIndex.ts
@@ -1,13 +1,13 @@
 import { assert } from "chai";
 import { BN, setLengthLeft, toBuffer, zeroAddress } from "ethereumjs-util";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { TransactionParams } from "../../../../../../../internal/hardhat-network/provider/node-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { TransactionParams } from "../../../../../../../src/internal/hardhat-network/provider/node-types";
 import {
   AccessListEIP2930RpcTransactionOutput,
   EIP1559RpcTransactionOutput,
   LegacyRpcTransactionOutput,
-} from "../../../../../../../internal/hardhat-network/provider/output";
+} from "../../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import {
   assertAccessListTransaction,

diff --git a/...ernal/hardhat-network/provider/modules/eth/methods/getTransactionByBlockNumberAndIndex.ts b/...ernal/hardhat-network/provider/modules/eth/methods/getTransactionByBlockNumberAndIndex.ts
@@ -1,13 +1,13 @@
 import { assert } from "chai";
 import { BN, toBuffer, zeroAddress } from "ethereumjs-util";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { TransactionParams } from "../../../../../../../internal/hardhat-network/provider/node-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { TransactionParams } from "../../../../../../../src/internal/hardhat-network/provider/node-types";
 import {
   EIP1559RpcTransactionOutput,
   LegacyRpcTransactionOutput,
   AccessListEIP2930RpcTransactionOutput,
-} from "../../../../../../../internal/hardhat-network/provider/output";
+} from "../../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import {
   assertAccessListTransaction,

diff --git a/...t-core/test/internal/hardhat-network/provider/modules/eth/methods/getTransactionByHash.ts b/...t-core/test/internal/hardhat-network/provider/modules/eth/methods/getTransactionByHash.ts
@@ -9,13 +9,13 @@ import {
   zeroAddress,
 } from "ethereumjs-util";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { TransactionParams } from "../../../../../../../internal/hardhat-network/provider/node-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { TransactionParams } from "../../../../../../../src/internal/hardhat-network/provider/node-types";
 import {
   AccessListEIP2930RpcTransactionOutput,
   EIP1559RpcTransactionOutput,
   LegacyRpcTransactionOutput,
-} from "../../../../../../../internal/hardhat-network/provider/output";
+} from "../../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import {
   assertAccessListTransaction,

diff --git a/...at-core/test/internal/hardhat-network/provider/modules/eth/methods/getTransactionCount.ts b/...at-core/test/internal/hardhat-network/provider/modules/eth/methods/getTransactionCount.ts
@@ -1,7 +1,7 @@
 import { zeroAddress } from "ethereumjs-util";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { randomAddress } from "../../../../../../../internal/hardhat-network/provider/fork/random";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { randomAddress } from "../../../../../../../src/internal/hardhat-network/provider/fork/random";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import {
   assertInvalidInputError,

diff --git a/...-core/test/internal/hardhat-network/provider/modules/eth/methods/getTransactionReceipt.ts b/...-core/test/internal/hardhat-network/provider/modules/eth/methods/getTransactionReceipt.ts
@@ -1,12 +1,12 @@
 import { assert } from "chai";
 import { BN, bufferToHex, toBuffer } from "ethereumjs-util";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { TransactionParams } from "../../../../../../../internal/hardhat-network/provider/node-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { TransactionParams } from "../../../../../../../src/internal/hardhat-network/provider/node-types";
 import {
   RpcBlockOutput,
   RpcReceiptOutput,
-} from "../../../../../../../internal/hardhat-network/provider/output";
+} from "../../../../../../../src/internal/hardhat-network/provider/output";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import {
   assertQuantity,

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/index.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/index.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { COINBASE_ADDRESS } from "../../../../../../../internal/hardhat-network/provider/node";
+import { COINBASE_ADDRESS } from "../../../../../../../src/internal/hardhat-network/provider/node";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import {
   assertNotSupported,

diff --git a/...test/internal/hardhat-network/provider/modules/eth/methods/newPendingTransactionFilter.ts b/...test/internal/hardhat-network/provider/modules/eth/methods/newPendingTransactionFilter.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { zeroAddress } from "ethereumjs-util";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import { setCWD } from "../../../../helpers/cwd";
 import { PROVIDERS } from "../../../../helpers/providers";

diff --git a/...ardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/sendTransaction.ts b/...ardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/sendTransaction.ts
@@ -4,8 +4,9 @@ import { BN, bufferToHex, toBuffer, zeroAddress } from "ethereumjs-util";
 import {
   numberToRpcQuantity,
   rpcQuantityToNumber,
-} from "../../../../../../../internal/core/jsonrpc/types/base-types";
-import { InvalidInputError } from "../../../../../../../internal/core/providers/errors";
+  rpcQuantityToBN,
+} from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
+import { InvalidInputError } from "../../../../../../../src/internal/core/providers/errors";
 import { workaroundWindowsCiFailures } from "../../../../../../utils/workaround-windows-ci-failures";
 import {
   assertInvalidInputError,
@@ -31,7 +32,6 @@ import {
   EIP1559RpcTransactionOutput,
   RpcBlockOutput,
 } from "../../../../../../../src/internal/hardhat-network/provider/output";
-import { rpcQuantityToBN } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 
 describe("Eth module", function () {
   PROVIDERS.forEach(({ name, useProvider, isFork, isJsonRpc }) => {

diff --git a/...ages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/subscribe.ts b/...ages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/methods/subscribe.ts
@@ -2,7 +2,7 @@ import { assert } from "chai";
 import { zeroAddress } from "ethereumjs-util";
 import { ethers } from "ethers";
 
-import { numberToRpcQuantity } from "../../../../../../../internal/core/jsonrpc/types/base-types";
+import { numberToRpcQuantity } from "../../../../../../../src/internal/core/jsonrpc/types/base-types";
 import {
   EthereumProvider,
   EthSubscription,

diff --git a/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/receiptsRoot.ts b/packages/hardhat-core/test/internal/hardhat-network/provider/modules/eth/receiptsRoot.ts
@@ -1,6 +1,6 @@
 import { assert } from "chai";
 
-import { numberToRpcQuantity } from "../../../../../../internal/core/jsonrpc/types/base-types";
+import { numberToRpcQuantity } from "../../../../../../src/internal/core/jsonrpc/types/base-types";
 import { workaroundWindowsCiFailures } from "../../../../../utils/workaround-windows-ci-failures";
 import { setCWD } from "../../../helpers/cwd";
 import {