hardhat: revert changes

Author: elopez

crytic_compile/platform/hardhat.py

@@ -35,17 +35,6 @@ class Hardhat(AbstractPlatform):
     PROJECT_URL = "https://github.com/nomiclabs/hardhat"
     TYPE = Type.HARDHAT
 
-    def __init__(self, target: str, **kwargs: str):
-        super().__init__(target, **kwargs)
-
-        self._ignore_compile = kwargs.get("hardhat_ignore_compile", False) or kwargs.get(
-            "ignore_compile", False
-        )
-
-        self._base_cmd = ["hardhat"]
-        if not kwargs.get("npx_disable", False):
-            self._base_cmd = ["npx"] + self._base_cmd
-
     # pylint: disable=too-many-locals,too-many-statements
     def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None:
         """Run the compilation
@@ -59,7 +48,15 @@ def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None:
             InvalidCompilation: If hardhat failed to run
         """
 
-        detected_paths = self._get_hardhat_paths(kwargs)
+        hardhat_ignore_compile = kwargs.get("hardhat_ignore_compile", False) or kwargs.get(
+            "ignore_compile", False
+        )
+
+        base_cmd = ["hardhat"]
+        if not kwargs.get("npx_disable", False):
+            base_cmd = ["npx"] + base_cmd
+
+        detected_paths = self._get_hardhat_paths(base_cmd, kwargs)
 
         build_directory = Path(
             self._target,
@@ -69,8 +66,8 @@ def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None:
 
         hardhat_working_dir = Path(self._target, detected_paths["root"])
 
-        if not self._ignore_compile:
-            cmd = self._base_cmd + ["compile", "--force"]
+        if not hardhat_ignore_compile:
+            cmd = base_cmd + ["compile", "--force"]
 
             LOGGER.info(
                 "'%s' running",
@@ -246,11 +243,14 @@ def _guessed_tests(self) -> List[str]:
         """
         return ["hardhat test"]
 
-    def _get_hardhat_paths(self, args: Dict[str, str]) -> Dict[str, Union[Path, str]]:
+    def _get_hardhat_paths(
+        self, base_cmd: List[str], args: Dict[str, str]
+    ) -> Dict[str, Union[Path, str]]:
         """Obtain hardhat configuration paths, defaulting to the
         standard config if needed.
 
         Args:
+            base_cmd ([str]): hardhat command
             args (Dict[str, str]): crytic-compile options that may affect paths
 
         Returns:
@@ -277,7 +277,7 @@ def _get_hardhat_paths(self, args: Dict[str, str]) -> Dict[str, Union[Path, str]
             override_paths["root"] = Path(target_path, args["hardhat_working_dir"])
 
         print_paths = "console.log(JSON.stringify(config.paths))"
-        config_str = self._run_hardhat_console(print_paths)
+        config_str = self._run_hardhat_console(base_cmd, print_paths)
 
         try:
             paths = json.loads(config_str or "{}")
@@ -286,22 +286,23 @@ def _get_hardhat_paths(self, args: Dict[str, str]) -> Dict[str, Union[Path, str]
             LOGGER.info("Problem deserializing hardhat configuration: %s", e)
             return {**default_paths, **override_paths}
 
-    def _run_hardhat_console(self, command: str) -> Optional[str]:
+    def _run_hardhat_console(self, base_cmd: List[str], command: str) -> Optional[str]:
         """Run a JS command in the hardhat console
 
         Args:
+            base_cmd ([str]): hardhat command
             command (str): console command to run
 
         Returns:
             Optional[str]: command output if execution succeeds
         """
         with subprocess.Popen(
-            self._base_cmd + ["console", "--no-compile"],
+            base_cmd + ["console", "--no-compile"],
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             cwd=self._target,
-            executable=shutil.which(self._base_cmd[0]),
+            executable=shutil.which(base_cmd[0]),
         ) as process:
             stdout_bytes, stderr_bytes = process.communicate(command.encode("utf-8"))
             stdout, stderr = (