Skip to content

Import libraries when they are needed #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cgewecke merged 6 commits into from
Sep 5, 2022
Merged

Import libraries when they are needed #126

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff7a3be
Import BackwardsCompatibilityProviderAdapter when used
alcuadrado Sep 3, 2022
87627f0
Import providers when needed
alcuadrado Sep 3, 2022
a00b7bf
Import globSync when needed
alcuadrado Sep 3, 2022
5c283cb
Import sha1 when needed
alcuadrado Sep 3, 2022
92c8a6e
Import array-unique when needed
alcuadrado Sep 3, 2022
8b6fe6f
Import eth-gas-reporter when needed
alcuadrado Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
import fs from "fs"
import path from "path"
import sha1 from "sha1"
import arrayUniq from "array-uniq";
import { TASK_TEST_RUN_MOCHA_TESTS } from "hardhat/builtin-tasks/task-names";
import { task, subtask } from "hardhat/config";
import { HARDHAT_NETWORK_NAME, HardhatPluginError } from "hardhat/plugins";
import { globSync } from "hardhat/internal/util/glob";
import {
BackwardsCompatibilityProviderAdapter
} from "hardhat/internal/core/providers/backwards-compatibility"


import {
EGRDataCollectionProvider,
EGRAsyncApiProvider
} from "./providers";
import type { EGRAsyncApiProvider as EGRAsyncApiProviderT } from "./providers";

import {
HardhatArguments,
Expand All @@ -31,9 +21,6 @@ import { EthGasReporterConfig, EthGasReporterOutput, RemoteContract } from "./ty
import { TASK_GAS_REPORTER_MERGE, TASK_GAS_REPORTER_MERGE_REPORTS } from "./task-names";
import { mergeReports } from "./merge-reports";

const { parseSoliditySources, setGasAndPriceRates } = require('eth-gas-reporter/lib/utils');
const InternalReporterConfig = require('eth-gas-reporter/lib/config');

let mochaConfig;
let resolvedQualifiedNames: string[]
let resolvedRemoteContracts: RemoteContract[] = [];
Expand Down Expand Up @@ -155,9 +142,10 @@ function getOptions(hre: HardhatRuntimeEnvironment): any {
* @return {Promise<RemoteContract[]>}
*/
async function getResolvedRemoteContracts(
provider: EGRAsyncApiProvider,
provider: EGRAsyncApiProviderT,
remoteContracts: RemoteContract[] = []
) : Promise <RemoteContract[]> {
const { defualt : sha1 } = await import("sha1");
for (const contract of remoteContracts){
let code;
try {
Expand Down Expand Up @@ -194,6 +182,10 @@ subtask(TASK_TEST_RUN_MOCHA_TESTS).setAction(
return result;
}


const { parseSoliditySources, setGasAndPriceRates } = require('eth-gas-reporter/lib/utils');
const InternalReporterConfig = require('eth-gas-reporter/lib/config');

// Fetch data from gas and coin price providers
options = new InternalReporterConfig(options);
await setGasAndPriceRates(options);
Expand All @@ -203,6 +195,16 @@ subtask(TASK_TEST_RUN_MOCHA_TESTS).setAction(
mochaConfig.reporterOptions = options;

if (hre.network.name === HARDHAT_NETWORK_NAME || options.fast){

const {
BackwardsCompatibilityProviderAdapter
} = await import("hardhat/internal/core/providers/backwards-compatibility")

const {
EGRDataCollectionProvider,
EGRAsyncApiProvider
} = await import("./providers");

const wrappedDataProvider= new EGRDataCollectionProvider(hre.network.provider,mochaConfig);
hre.network.provider = new BackwardsCompatibilityProviderAdapter(wrappedDataProvider);

Expand Down Expand Up @@ -256,7 +258,9 @@ task(TASK_GAS_REPORTER_MERGE)
const output = path.resolve(process.cwd(), taskArguments.output);

// Parse input files and calculate glob patterns
const inputFiles = arrayUniq<string>(taskArguments.input.map(globSync).flat())
const { globSync } = await import("hardhat/internal/util/glob");
const arrayUniq = require("array-uniq");
const inputFiles = arrayUniq(taskArguments.input.map(globSync).flat())
.map(inputFile => path.resolve(inputFile));

if (inputFiles.length === 0) {
Expand Down